Skip to content
Browse files

added more aliases and changed diff algorithm

  • Loading branch information...
1 parent a8f200b commit 9015262250cbf5c81b9907280488926f20eecf0f @ranman committed
Showing with 3 additions and 12 deletions.
  1. +3 −12 .gitconfig
View
15 .gitconfig
@@ -15,16 +15,7 @@
assume = update-index --assume-unchanged
unassume = update-index --no-assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
-[difftool "Kaleidoscope"]
- cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+ ours = "!f() { git checkout --ours $@ && git add $@; }; f"
+ theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
[diff]
- tool = Kaleidoscope
-[difftool]
- prompt = false
-[mergetool "Kaleidoscope"]
- cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
- trustExitCode = true
-[mergetool]
- prompt = false
-[merge]
- tool = Kaleidoscope
+ algorithm = patience

0 comments on commit 9015262

Please sign in to comment.
Something went wrong with that request. Please try again.