X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fgitconfig;h=c8aec3bcc6d363f8d112da683a5407cfb4b0d2a6;hb=0a3650b377bc7cd6dc5852866af94e912a280dd3;hp=80b45a553e6eab4d2c38e437cb84576d6d9be341;hpb=344d30b264bdc41793939e884caae3464f3995c8;p=shutils.git

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