|
|
@ -33,6 +33,7 @@
|
|
|
|
[push]
|
|
|
|
[push]
|
|
|
|
default = current
|
|
|
|
default = current
|
|
|
|
followTags = true
|
|
|
|
followTags = true
|
|
|
|
|
|
|
|
recurseSubmodules = check
|
|
|
|
[difftool "kaleidoscope"]
|
|
|
|
[difftool "kaleidoscope"]
|
|
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
|
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
|
|
|
[mergetool "kaleidoscope"]
|
|
|
|
[mergetool "kaleidoscope"]
|
|
|
|