X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=gitconfig;h=7f660898b1ac542bc81fef73d8c7f96add1257fd;hb=f6a4bc6bc44a904d11b58d3a1147343b452377dd;hp=9ab641163820e92cb424b9cbf52c33ab01f49b17;hpb=2f409fbfdafa8376e9b2a8862a55a8c93a21d269;p=~madcoder%2Fdotfiles.git

diff --git a/gitconfig b/gitconfig
index 9ab6411..7f66089 100644
--- a/gitconfig
+++ b/gitconfig
@@ -24,6 +24,9 @@
     excludesfile=/home/madcoder/.git-excludes
     preloadindex=true
 
+[push]
+    default = tracking
+
 [user]
     name  = Pierre Habouzit
     email = madcoder@debian.org
@@ -49,6 +52,7 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
 [clean]
     requireForce = false
 [pack]