m/dotfiles
1
0
Fork 0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-11-22 09:47:21 +01:00
Code Releases Activity

kaleidoscope as merge tool

Browse Source
This commit is contained in:
Matthias Kretschmann 2013-06-25 13:28:47 +02:00
parent 4f55bae930
commit d905f3c554
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gitconfig
View File

@ -41,18 +41,17 @@
cm = commit -m cm = commit -m
l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset' l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
ll = log --stat --abbrev-commit ll = log --stat --abbrev-commit
[difftool "sourcetree"] [difftool "Kaleidoscope"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\" cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[diff] [diff]
tool = diffmerge tool = Kaleidoscope
[difftool "diffmerge"] [difftool]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\" prompt = false
[merge]
tool = diffmerge [mergetool "Kaleidoscope"]
[mergetool "diffmerge"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true trustExitCode = true
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope