From 2fd164ea77b6153b096a135db8f493be8e5f4573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Neumann?= <rene.neumann@in.tum.de>
Date: Mon, 1 Oct 2012 17:13:52 +0200
Subject: More git changes

---
 .gitconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 2503369..a366dd8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,8 +11,9 @@
 	d = diff
 	dc = diff --cached
 	s = status
+	st = status
 	alias = "!bash -c '[ $# = 2 ] && git config --global alias.\"$1\" \"$2\" && exit 0 || echo \"usage: git alias <new alias> <original command>\" >&2 && exit 1' -"
-	ll = log --name-status --color -M -C
+	ll = log --name-status --decorate -M -C
 	com = checkout master
 	cleanse = clean -xfd
 	spush = svn dcommit
@@ -24,6 +25,8 @@
 	rename = copy
 [core]
 	excludesfile = ~/.gitexcludes
+[merge]
+	tool = vimdiff
 
 # colors :D
 [color]
-- 
cgit v1.2.3