genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 09:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Araxis integration to sample .gitconfig

Browse source
This commit is contained in:
Gene Liverman 2019-05-03 23:26:18 -04:00
parent 42deb5e184
commit e24dff96da
No known key found for this signature in database
GPG key ID: 66D794FE7043CBCA
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
copy/mac/gitconfig
View file

@ -1,8 +1,12 @@
[core] [core]
excludesfile = /Users/gliverma/.gitignore_global excludesfile = /Users/gliverma/.gitignore_global
[diff]
tool = araxis
[difftool "sourcetree"] [difftool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/araxiscompare-w.sh -2 \"$LOCAL\" \"$REMOTE\" cmd = /Applications/SourceTree.app/Contents/Resources/araxiscompare-w.sh -2 \"$LOCAL\" \"$REMOTE\"
path = path =
[merge]
tool = araxis
[mergetool "sourcetree"] [mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/araxisgitmerge-w.sh \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" cmd = /Applications/SourceTree.app/Contents/Resources/araxisgitmerge-w.sh \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\"
trustExitCode = true trustExitCode = true