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

diff --git a/gitconfig b/gitconfig
index f19f617..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
@@ -52,6 +56,7 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
 [clean]
     requireForce = false
 [pack]
@@ -60,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