-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig.tmpl
86 lines (83 loc) · 2.27 KB
/
dot_gitconfig.tmpl
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
[user]
email = {{ onepasswordRead "op://Personal/44b5wmbx2pnv7xww6vzfzjy2ki/email" }}
name = "{{ onepasswordRead "op://Personal/44b5wmbx2pnv7xww6vzfzjy2ki/first name" }} {{ onepasswordRead "op://Personal/44b5wmbx2pnv7xww6vzfzjy2ki/last name" }}"
signingkey = "{{ onepasswordRead "op://Personal/6pnubzqtczttbtqs5orgl4nzxe/public key" }}"
[core]
excludesFile = {{ .chezmoi.homeDir }}{{ .chezmoi.pathSeparator}}.gitignore
[mergetool]
prompt = false
keepBackup = false
[merge]
tool = fugitive
conflictstyle = zdiff3
[init]
defaultBranch = main
templateDir= {{ .chezmoi.homeDir }}{{ .chezmoi.pathSeparator}}.git_template
[push]
default = current
autoSetupRemote = true
[diff]
colorMoved = default
algorithm = histogram
tool = difftastic
external = difft --display=inline
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft --display=inline "$LOCAL" "$REMOTE"
[pager]
difftool = true
[remote]
pushDefault = origin
[fetch]
prune = true
fsckObjects = true
[status]
short = true
[add.interactive]
useBuiltin = false # required for git 2.37.0
[rebase]
autosquash = true
autoStash = true
[alias]
ll=log --topo-order --abbrev-commit --pretty=format:'%C(bold blue)%h%Creset %Cgreen(%cr)%Creset %s %C(dim white)<%an>%Creset%C(bold yellow)%d%Creset'
betterlog=!git --no-pager ll --reverse
graphlog=ll --graph
difflog = "ll -p --ext-diff"
[commit]
gpgsign = true
verbose = true
[gpg]
format = ssh
[pull]
ff = only
[rerere]
enabled = true
[transfer]
fsckObjects = true
[receive]
fsckObjects = true
[branch]
sort = committerdate
{{ if (eq .chezmoi.os "darwin") -}}
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
{{ end -}}
[url "ssh://git@github.com/"]
insteadOf = /~https://github.com/
[mergetool "fugitive"]
cmd = nvim -f -c \"Gvdiffsplit!\" \"$MERGED\"
[diff "jupyternotebook"]
command = git-nbdiffdriver diff
[merge "jupyternotebook"]
driver = git-nbmergedriver merge %O %A %B %L %P
name = jupyter notebook merge driver
[difftool "nbdime"]
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
[mergetool "nbdime"]
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f