-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
42 lines (42 loc) · 1.03 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
[user]
name = Stefan Wrobel
email = [email protected]
[push]
default = current
autoSetupRemote = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = false
[merge]
tool = Kaleidoscope
[color]
ui = true
[core]
excludesfile = ~/.gitignore_global
editor = nano
pager = diff-so-fancy | less --tabs=4 -RFX
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[diff-so-fancy]
first-run = false
[status]
showUntrackedFiles = all
[credential]
helper = osxkeychain
[init]
defaultBranch = main
[rebase]
updateRefs = true