X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fgitconfig;h=c8aec3bcc6d363f8d112da683a5407cfb4b0d2a6;hb=984717f94cd3a7e6a8c8f0b32596a374344d536c;hp=7ff03478e7261f04acfac7e40bc6f6b72b1a7f45;hpb=197017be815b01cf506736326eecb20a64044d84;p=shutils.git

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7ff0347..c8aec3b 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -2,15 +2,32 @@
 	name = Stefan Huber
 	email = me@example.com
 	signingkey = 0123456
+[http]
+	#prxy = http://username:password@192.168.9.10:8080
 [color]
 	ui = auto
+	status = auto
+	branch = auto
+	diff = auto
+	interactive = auto
 [core]
 	editor = vim
 	pager = less -FXRS -x4
 [merge]
-	tool = gvimdiff
+	tool = splice
+[mergetool "splice"]
+	cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+	trustExitCode = true
 [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'
+[push]
+	default = simple