X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=gitconfig;h=3855ae96ae07aa1cfa49dc24b4b00a9eb9a72312;hb=2af82e92637833473bb7419b34ca7c9b8304dc54;hp=9ab641163820e92cb424b9cbf52c33ab01f49b17;hpb=2f409fbfdafa8376e9b2a8862a55a8c93a21d269;p=~madcoder%2Fdotfiles.git

diff --git a/gitconfig b/gitconfig
index 9ab6411..3855ae9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,12 +18,18 @@
     track=add -N
     untrack=rm --cached
 
+[merge]
+    tool=diffuse
+
 [core]
     #editor=gvim -f
     editor=vim
     excludesfile=/home/madcoder/.git-excludes
     preloadindex=true
 
+[push]
+    default = tracking
+
 [user]
     name  = Pierre Habouzit
     email = madcoder@debian.org
@@ -35,6 +41,7 @@
     status = auto
     pager  = true
     interactive = auto
+    grep   = auto
 
 [color "diff"]
     meta = green
@@ -49,6 +56,7 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
 [clean]
     requireForce = false
 [pack]
@@ -57,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