-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig_global
34 lines (34 loc) · 780 Bytes
/
.gitconfig_global
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
# -*- mode: gitconfig -*-
[core]
excludesfile = ~/.gitignore_global
autocrlf = false
ignorecase = false
safecrlf = warn
editor = emacsclient -a=\\\"\\\"
quotepath = false
pager = delta
[interactive]
diffFilter = delta --color-only
[color]
branch = auto
diff = auto
interactive = auto
status = auto
[pull]
rebase = false
[push]
default = current
[delta]
navigate = true
line-numbers = true
side-by-side = false
[diff]
tool = ediff
colorMoved = default
[merge]
tool = ediff
conflictstyle = diff3
[difftool "ediff"]
cmd = emacsclient -n -a \"\" --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
[mergetool "ediff"]
cmd = emacsclient -n -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"