From: Pierre Habouzit <madcoder@debian.org>
Date: Wed, 6 Oct 2010 09:27:56 +0000 (+0200)
Subject: various git updates
X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=a0cb634bc6451a1694a023cf1aea9ed97dfe4963;hp=13cef426cc23a32b4b9dc830e9e03688f3c475a9;p=~madcoder%2Fdotfiles.git

various git updates

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/gitconfig b/gitconfig
index 7f66089..3855ae9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,6 +18,9 @@
     track=add -N
     untrack=rm --cached
 
+[merge]
+    tool=diffuse
+
 [core]
     #editor=gvim -f
     editor=vim
@@ -38,6 +41,7 @@
     status = auto
     pager  = true
     interactive = auto
+    grep   = auto
 
 [color "diff"]
     meta = green
@@ -61,3 +65,11 @@
     submodulesummary = 1
 [push]
     default = tracking
+
+[sendemail]
+    smtpserver = smtp.mail.intersec.com
+    smtpuser = madcoder
+
+[merge "dpkg-mergechangelogs"]
+    name = debian/changelog merge driver
+    driver = dpkg-mergechangelogs -m %O %A %B %A