j3g
/
osxenv_pub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

diff and merging tools added, need to install on mac though...

This commit is contained in:
JohnE 2015-09-22 14:10:18 -07:00
parent 959618c282
commit 4483243d12
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitconfig
View File

@ -169,3 +169,7 @@
[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
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true