aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

gitconfig: refactor diff and merge tools

Browse source
This commit is contained in:
Henrik Lissner 2016-06-30 23:03:06 -04:00
parent 78214aa98c
commit 3f44c6f51a
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gitconfig
View file

@ -1,33 +1,42 @@
[user] [user]
name = Henrik Lissner name = Henrik Lissner
email = henrik@lissner.net email = henrik@lissner.net
[github] [github]
user = hlissner user = hlissner
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
whitespace = trailing-space whitespace = trailing-space
pager = less -r
[color] [color]
ui = true ui = true
[diff] [diff]
tool = vimdiff tool = vdiff
[difftool] [difftool "vdiff"]
prompt = false prompt = false
cmd = vimdiff \"$LOCAL\" \"$REMOTE\" cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
[difftool "ediff"] [difftool "ediff"]
cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\" cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
[merge] [merge]
# Include summaries of merged commits in newly created merge commit messages # Include summaries of merged commits in newly created merge commit messages
log = true log = true
tool = ediff tool = vmerge
[mergetool "ediff"] [mergetool "vmerge"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[mergetool "emerge"]
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\" cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[rebase] [rebase]
autosquash = true autosquash = true
[push] [push]
default = simple default = simple
[credential] [credential]
helper = osxkeychain helper = osxkeychain
[alias] [alias]
root = rev-parse --show-toplevel root = rev-parse --show-toplevel
undo-commit = reset --soft "HEAD^" undo-commit = reset --soft "HEAD^"