eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Kaleidoscope git's diff and merge tool

Browse source
This commit is contained in:
Eryn Wells 2013-01-05 10:28:25 -08:00
parent 674cb85503
commit 9df36b0a3f
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gitconfig
View file

@ -7,7 +7,7 @@
[color] [color]
ui = auto ui = auto
[merge] [merge]
tool = Kaleidoscope tool = Kaleidoscope
[alias] [alias]
# Commits # Commits
c = commit c = commit
@ -52,13 +52,14 @@
[ui] [ui]
color = true color = true
[diff] [diff]
tool = Kaleidoscope tool = Kaleidoscope
[mergetool] [mergetool]
keepBackup = true keepBackup = true
prompt = false prompt = false
[difftool] [difftool]
prompt = false prompt = false
[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"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true