11[core ]
2- excludesfile = ~/.gitignore
3- mergeoptions = --no-edit
2+ excludesfile = ~/.gitignore
3+ mergeoptions = --no-edit
44 pager = delta
55[interactive ]
66 diffFilter = delta --color-only
77[delta ]
8- navigate = true # use n and N to move between diff sections
8+ navigate = true # use n and N to move between diff sections
99
10- # delta detects terminal colors automatically; set one of these to disable auto-detection
11- # dark = true
12- # light = true
10+ # delta detects terminal colors automatically; set one of these to disable auto-detection
11+ # dark = true
12+ # light = true
1313[diff ]
1414 colorMoved = default
1515[merge ]
1616 ff = only
1717 conflictStyle = zdiff3
1818[user ]
19- name = Stefan Herold
20- email = 794372+Blackjacx@users.noreply.github.com
21- signingkey = DE546DEBFC1C1C01
19+ name = Stefan Herold
20+ email = 794372+Blackjacx@users.noreply.github.com
21+ signingkey = DE546DEBFC1C1C01
2222[push ]
23- default = simple
23+ default = simple
2424[branch ]
25- autosetuprebase = always
25+ autosetuprebase = always
2626[github ]
27- user = blackjacx
27+ user = blackjacx
2828[ghi ]
29- token = !security find-internet-password -a blackjacx -s github.com -l 'ghi token' -w
29+ token = !security find-internet-password -a blackjacx -s github.com -l 'ghi token' -w
3030[credential ]
31- helper = osxkeychain
31+ helper = osxkeychain
3232[gpg ]
33- program = /usr/local/bin/gpg
33+ program = /usr/local/bin/gpg
3434[filter "lfs "]
35- clean = git-lfs clean -- %f
36- smudge = git-lfs smudge -- %f
37- process = git-lfs filter-process
38- required = true
35+ clean = git-lfs clean -- %f
36+ smudge = git-lfs smudge -- %f
37+ process = git-lfs filter-process
38+ required = true
3939[pull ]
40- rebase = true
40+ rebase = true
4141[rerere ]
42- enabled = true
42+ enabled = true
4343[rebase ]
44- autosquash = true
45- autoStash = true
44+ autosquash = true
45+ autoStash = true
4646[init ]
47- defaultBranch = main
47+ defaultBranch = main
4848[pager ]
49- diff = true
50- log = true
49+ diff = true
50+ log = true
5151[fetch ]
52- prune = true
52+ prune = true
5353[absorb ]
54- maxStack = 30 # default: 10
54+ maxStack = 30 # default: 10
0 commit comments