From f56a77a50004179b22161f6d006b5f915ed82ef3 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Mon, 13 Oct 2014 11:40:48 +0200
Subject: [PATCH] update gitconfig

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 dot_files/gitconfig | 44 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/dot_files/gitconfig b/dot_files/gitconfig
index 7462bf3e2..8b32a0761 100644
--- a/dot_files/gitconfig
+++ b/dot_files/gitconfig
@@ -1,5 +1,7 @@
 # Please copy this part to your ~/.gitconfig
 # or include it if git > 0.7.10
+# [include]
+#    path = /home/gsemet/.oh-my-zsh/dot_files/gitconfig
 
 [alias]
    commit = commit -s # Always sign commit
@@ -31,10 +33,6 @@
    sync = fetch --all
    root = rev-parse --show-toplevel
 
-# This only works if git > 0.7.10
-# # [include]
-# #    path = /home/username/.oh-my-zsh/dot_files/gitconfig
-
 [color]
 ui = auto
 
@@ -54,11 +52,41 @@ tool = kdiff3
 [guitool "mergetool"]
 cmd = git mergetool --no-prompt
 
-# [mergetool "kdiff3"]
-# cmd = kdiff3
-# args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
-# keepBackup = false
+[push]
+  default = current
+
+
+[color]
+    ui = auto
+
+[core]
+  editor = vim
+#  abbrev = 12
+
+[commit]
+    template = /home/gsemet/.gitmessage
+
+[user]
+    email = gaetan@xeberon.net
+    name = Gaetan Semet
+
+[cola]
+    fontdiff = Courier 10 Pitch,9,-1,5,50,0,0,0,0,0
+    tabwidth = 4
+
+[guitool "mergetool"]
+  cmd = git mergetool --no-prompt
+
+[merge]
+    tool = kdiff3
+
+[mergetool "kdiff3"]
+  cmd = kdiff3
+  args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
+  keepBackup = false
 
 [push]
   default = current
 
+[gui]
+  newbranchtemplate = gsemet_