X-Git-Url: http://git.madism.org/?p=~madcoder%2Fdotfiles.git;a=blobdiff_plain;f=gitconfig;h=3855ae96ae07aa1cfa49dc24b4b00a9eb9a72312;hp=e8d3d4e682706a7dfb12e3f9360f3449bcef3d15;hb=1f66b92bd417b2e96d9b819a9ca256cfb4e8fe98;hpb=57d57d0d31928a5e2085f41575252f4632f24e88

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