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

diff --git a/gitconfig b/gitconfig
index e8d3d4e..7f66089 100644
--- a/gitconfig
+++ b/gitconfig
@@ -19,11 +19,14 @@
     untrack=rm --cached
 
 [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
@@ -41,7 +44,6 @@
     frag = yellow
     old = magenta
     new = bold cyan
-;	message = bold
 
 [color "status"]
     header = bold blue
@@ -50,9 +52,12 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
 [clean]
     requireForce = false
 [pack]
     threads = 0
 [status]
     submodulesummary = 1
+[push]
+    default = tracking