|
|
@ -32,6 +32,7 @@
|
|
|
|
trustExitCode = true
|
|
|
|
trustExitCode = true
|
|
|
|
[push]
|
|
|
|
[push]
|
|
|
|
default = current
|
|
|
|
default = current
|
|
|
|
|
|
|
|
followTags = true
|
|
|
|
[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"]
|
|
|
@ -60,3 +61,5 @@
|
|
|
|
sort = version:refname
|
|
|
|
sort = version:refname
|
|
|
|
[rebase]
|
|
|
|
[rebase]
|
|
|
|
autosquash = true
|
|
|
|
autosquash = true
|
|
|
|
|
|
|
|
[interactive]
|
|
|
|
|
|
|
|
singlekey = true
|
|
|
|