gitconfig split for mac
This commit is contained in:
parent
21d60ed3d0
commit
27fda278ef
4 changed files with 12 additions and 8 deletions
4
.gitconfig.mac
Normal file
4
.gitconfig.mac
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
[include]
|
||||||
|
path = dev/dotfiles/.gitconfig_includes.common
|
||||||
|
path = dev/dotfiles/.gitconfig_includes.mac
|
||||||
|
|
7
.gitconfig_includes.common
Normal file
7
.gitconfig_includes.common
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
[user]
|
||||||
|
name = Cyryl Plotnicki-Chudyk
|
||||||
|
email = cyplo@cyplo.net
|
||||||
|
[color]
|
||||||
|
ui = true
|
||||||
|
[help]
|
||||||
|
autocorrect = 1
|
|
@ -1,5 +1,3 @@
|
||||||
[user]
|
|
||||||
name = Cyryl Plotnicki-Chudyk
|
|
||||||
|
|
||||||
[mergetool "filemerge"]
|
[mergetool "filemerge"]
|
||||||
cmd = /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -merge $MERGED -left $LOCAL -ancestor $BASE -right $REMOTE
|
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"]
|
[mergetool "sourcetree"]
|
||||||
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
||||||
trustExitCode = true
|
trustExitCode = true
|
||||||
[push]
|
|
||||||
default = simple
|
|
||||||
[color]
|
|
||||||
ui = true
|
|
||||||
[help]
|
|
||||||
autocorrect = 1
|
|
Loading…
Reference in a new issue