-
Notifications
You must be signed in to change notification settings - Fork 4
/
config
27 lines (27 loc) · 673 Bytes
/
config
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
[user]
name = Michaël Defferrard
email = m.deff@hotmail.com
[push]
default = simple
[pull]
ff = only # fast-forward only
[difftool "nbdime"]
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
[difftool]
prompt = false
[mergetool "nbdime"]
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
prompt = false
[url "ssh://git@github.com/"]
insteadOf = "github:"
[url "https://aur.archlinux.org/"]
insteadOf = "aur:"
[url "ssh://aur@aur.archlinux.org/"]
pushInsteadOf = "aur:"
[core]
pager = "type delta >/dev/null 2>&1 && exec delta || exec less --tabs=4 -RFX"
[init]
defaultBranch = main
[credential]
helper = store