bo
/
dotfiles
mirror of https://github.com/bjeanes/dotfiles.git
1
0
Fork 0
Code Releases Activity

Fix Kaleidoscope tool for git merging

Bo Jeanes 2017-04-02 10:19:47 +10:00
parent 5f99942c10
commit fd85d405d4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vcs/git/gitconfig
View File

@ -65,9 +65,11 @@
algorithm = minimal algorithm = minimal
mnemonicprefix = true mnemonicprefix = true
renames = copies renames = copies
[merge] tool = ksdiff
conflictstyle = diff3 [difftool]
tool = Kaleidoscope prompt = false
[difftool "ksdiff"]
cmd = "ksdiff $LOCAL $REMOTE"
[pull] [pull]
rebase = true rebase = true
[heroku] [heroku]

9
vcs/git/gitconfig.merge
View File

@ -2,7 +2,14 @@
[merge] [merge]
summary = true summary = true
tool = opendiff conflictstyle = diff3
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
# http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html # http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html
[merge "bundlelock"] [merge "bundlelock"]