From 53eee41b033dad821da9c878b9ad59d504ba138f Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Wed, 10 Oct 2018 19:28:45 +0200 Subject: [PATCH] git: update gitconfig --- dotfiles/gitconfig | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 80b45a5..c8aec3b 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -13,18 +13,21 @@ [core] editor = vim pager = less -FXRS -x4 +[merge] + tool = splice [mergetool "splice"] cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" trustExitCode = true -[merge] - tool = splice -[push] - default = simple [alias] - wdiff = diff --color-words - wlog = log --color-words + wdiff = diff -w --word-diff-regex="[^[:space:]]" + wlog = log -w --word-diff-regex="[^[:space:]]" + wshow = show -w --word-diff-regex="[^[:space:]]" +[log] + decorate [diff] renames = true submodule = log [status] - #submodulesummary = true ; reduces speed of 'git status' \ No newline at end of file + #submodulesummary = true ; reduces speed of 'git status' +[push] + default = simple -- 2.39.5