gitconfig split for mac

This commit is contained in:
Cyryl Plotnicki-Chudyk 2013-10-09 12:21:14 +02:00
parent 21d60ed3d0
commit 27fda278ef
4 changed files with 12 additions and 8 deletions

4
.gitconfig.mac Normal file
View file

@ -0,0 +1,4 @@
[include]
path = dev/dotfiles/.gitconfig_includes.common
path = dev/dotfiles/.gitconfig_includes.mac

View file

@ -0,0 +1,7 @@
[user]
name = Cyryl Plotnicki-Chudyk
email = cyplo@cyplo.net
[color]
ui = true
[help]
autocorrect = 1

View file

@ -1,5 +1,3 @@
[user]
name = Cyryl Plotnicki-Chudyk
[mergetool "filemerge"]
cmd = /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -merge $MERGED -left $LOCAL -ancestor $BASE -right $REMOTE
@ -25,9 +23,4 @@
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[push]
default = simple
[color]
ui = true
[help]
autocorrect = 1