|
|
@ -16,7 +16,7 @@ |
|
|
|
[difftool "default-difftool"] |
|
|
|
cmd = $VISUAL --wait --diff $LOCAL $REMOTE |
|
|
|
[core] |
|
|
|
excludesfile = /home/mtib/.gitignore |
|
|
|
excludesfile = /Users/mtib/.gitignore_global |
|
|
|
autocrlf = input |
|
|
|
[pull] |
|
|
|
rebase = true |
|
|
@ -26,3 +26,9 @@ |
|
|
|
defaultBranch = main |
|
|
|
[gpg] |
|
|
|
program = gpg |
|
|
|
[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 |