Update gitconfig

This commit is contained in:
2014-04-12 13:14:42 +01:00
parent 35da8ff8c1
commit c46290f82c

View File

@@ -33,8 +33,15 @@
[branch]
autosetuprebase = always
[difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
prompt = false
[diff]
tool = Kaleidoscope
tool = Kaleidoscope
[credential]
helper = osxkeychain
[include]
path = ~/.gitconfig_private
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f