gitconfig for mac boxes
This commit is contained in:
parent
c5807a9bf7
commit
e7eedc99be
1 changed files with 27 additions and 0 deletions
27
gitconfig_mac
Normal file
27
gitconfig_mac
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
[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
|
||||||
|
trustExitCode = false
|
||||||
|
[core]
|
||||||
|
excludesfile = /Users/cplotnicki/.gitignore_global
|
||||||
|
[difftool "kdiff3"]
|
||||||
|
path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
|
||||||
|
trustExitCode = false
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
|
[diff]
|
||||||
|
tool = kdiff3
|
||||||
|
[mergetool "kdiff3"]
|
||||||
|
path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
|
||||||
|
trustExitCode = false
|
||||||
|
keepBackup = false
|
||||||
|
[merge]
|
||||||
|
tool = kdiff3
|
||||||
|
[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
|
Loading…
Reference in a new issue