-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
68 lines (66 loc) · 1.49 KB
/
.gitconfig
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
[user]
email = [email protected]
name = Tuomas Kareinen
[alias]
br = branch
ci = commit -v
co = checkout
cp = cherry-pick
df = diff
dfc = diff --cached
fep = fetch --prune
gr = grep -n
lg = log --cc --patch-with-stat --decorate
lt = log --cc --graph --oneline --decorate
pl = pull
rv = revert
s = status -s -b -u
slg = shortlog -s -n
sm = submodule
st = status --long -b -u
[color]
ui = auto
[core]
excludesfile = ~/.gitignore
[diff]
# See https://luppeng.wordpress.com/2020/10/10/when-to-use-each-of-the-git-diff-algorithms/
algorithm = histogram
renames = true
submodule = log
tool = ediffclient
[diff "sopsdiffer"]
textconv = sops -d
[difftool]
prompt = true
[difftool "ediffclient"]
cmd = emacsclient --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
[format]
numbered = true
[init]
defaultBranch = main
[merge]
# See https://ductile.systems/zdiff3/
conflictstyle = zdiff3
ff = only
tool = ediffclient
[mergetool]
prompt = true
[mergetool "ediffclient"]
cmd = emacsclient --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[pull]
ff = only
[push]
default = simple
[rebase]
autosquash = true
[rerere]
enabled = true
[status]
submodulesummary = 1
[submodule]
fetchJobs = 4
[stash]
showPatch = true
# Must be last: git includes the contents of the file immediately.
[include]
path = ~/.gitconfig.host