|
|
@ -24,20 +24,14 @@
|
|
|
|
prompt = false
|
|
|
|
prompt = false
|
|
|
|
[difftool "sourcetree"]
|
|
|
|
[difftool "sourcetree"]
|
|
|
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
|
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
|
|
[mergetool "sourcetree"]
|
|
|
|
|
|
|
|
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
|
|
|
|
|
|
trustExitCode = true
|
|
|
|
|
|
|
|
[push]
|
|
|
|
|
|
|
|
default = current
|
|
|
|
|
|
|
|
followTags = true
|
|
|
|
|
|
|
|
recurseSubmodules = on-demand
|
|
|
|
|
|
|
|
[difftool "kaleidoscope"]
|
|
|
|
[difftool "kaleidoscope"]
|
|
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
|
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
|
|
|
[mergetool "kaleidoscope"]
|
|
|
|
|
|
|
|
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
|
|
|
|
|
|
|
trustExitCode = true
|
|
|
|
|
|
|
|
[difftool "icdiff"]
|
|
|
|
[difftool "icdiff"]
|
|
|
|
cmd = icdiff --line-numbers --no-bold \"$LOCAL\" \"$REMOTE\"
|
|
|
|
cmd = icdiff --line-numbers --no-bold \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
|
|
|
[push]
|
|
|
|
|
|
|
|
default = current
|
|
|
|
|
|
|
|
followTags = true
|
|
|
|
|
|
|
|
recurseSubmodules = on-demand
|
|
|
|
[grep]
|
|
|
|
[grep]
|
|
|
|
extendRegexp = true
|
|
|
|
extendRegexp = true
|
|
|
|
lineNumber = true
|
|
|
|
lineNumber = true
|
|
|
@ -48,6 +42,13 @@
|
|
|
|
[merge]
|
|
|
|
[merge]
|
|
|
|
conflictstyle = diff3
|
|
|
|
conflictstyle = diff3
|
|
|
|
ff = false
|
|
|
|
ff = false
|
|
|
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
|
|
|
[mergetool "sourcetree"]
|
|
|
|
|
|
|
|
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
|
|
|
|
|
|
trustExitCode = true
|
|
|
|
|
|
|
|
[mergetool "kaleidoscope"]
|
|
|
|
|
|
|
|
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
|
|
|
|
|
|
|
trustExitCode = true
|
|
|
|
[init]
|
|
|
|
[init]
|
|
|
|
templatedir = ~/.git_templates
|
|
|
|
templatedir = ~/.git_templates
|
|
|
|
[diff]
|
|
|
|
[diff]
|
|
|
|