2013-11-16 20:20:07 +00:00
|
|
|
[include]
|
|
|
|
|
path = dev/dotfiles/.gitconfig_includes.common
|
|
|
|
|
path = dev/dotfiles/.gitconfig_includes.linux
|
|
|
|
|
|
2013-11-16 20:39:58 +00:00
|
|
|
[alias]
|
|
|
|
|
signedcommit = !git commit -S
|
2018-10-17 10:15:34 +01:00
|
|
|
|
2018-06-07 11:36:29 +01:00
|
|
|
[difftool "sourcetree"]
|
|
|
|
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
path =
|
2018-10-17 10:15:34 +01:00
|
|
|
|
2018-06-07 11:36:29 +01:00
|
|
|
[mergetool "sourcetree"]
|
|
|
|
|
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
|
|
|
trustExitCode = true
|
