-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
49 lines (49 loc) · 1.06 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
[user]
name = Calle Helmertz
email = [email protected]
[pull]
rebase = true
[diff]
tool = meld
algorithm = patience
[merge]
tool = meld
[rebase]
autoSquash = true
[color]
ui = auto
[push]
default = current
autoSetupRemote = true
[log]
decorate = true
date = human
[core]
excludesfile = ~/.gitignore_global
attributesfile = ~/.gitattributes
# GIT_PAGER=less git diff, if you want to opt out
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
[includeIf "gitdir:~/code/matchi/"]
path = ~/code/github/chelmertz/dotfiles/work.gitconfig
[help]
autocorrect = 1
[branch]
autoSetupMerge = simple
[init]
defaultBranch = main
[github]
user = chelmertz
[url "ssh://[email protected]/"]
insteadOf = https://github.com/
[rerere]
enabled = true
[merge "mergiraf"]
# see https://mergiraf.org/usage.html for usage & CLI flags
name = mergiraf
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P