git: update gitconfig

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 80b45a553e6eab4d2c38e437cb84576d6d9be341..c8aec3bcc6d363f8d112da683a5407cfb4b0d2a6 100644 (file)
--- 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