Skip to content

Commit b6c15f9

Browse files
committed
update gitconfig
1 parent 7e1654e commit b6c15f9

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

gitconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,14 @@ cmd = difft "$LOCAL" "$REMOTE"
7070

7171
[pager]
7272
difftool = true
73+
[difftool "sourcetree"]
74+
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
75+
path =
76+
[mergetool "sourcetree"]
77+
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
78+
trustExitCode = true
79+
[filter "lfs"]
80+
smudge = git-lfs smudge -- %f
81+
process = git-lfs filter-process
82+
required = true
83+
clean = git-lfs clean -- %f

0 commit comments

Comments
 (0)