From 793e105b9110315625e94a3a6d3fcb15ac6d4dfd Mon Sep 17 00:00:00 2001
From: David Kaufmann <astra@ionic.at>
Date: Wed, 3 Sep 2014 18:38:26 +0200
Subject: update gitconfig

---
 skel/.gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/skel/.gitconfig b/skel/.gitconfig
index 77fcfb8..604ada8 100644
--- a/skel/.gitconfig
+++ b/skel/.gitconfig
@@ -25,3 +25,9 @@
 
 [merge]
 	tool = meld
+
+[pull]
+	rebase = preserve
+
+[alias]
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
-- 
cgit v1.2.3