Use diff3 conflicts.

[~madcoder/dotfiles.git] / gitconfig

diff --git a/gitconfig b/gitconfig
index e8d3d4e..7f66089 100644 (file)
--- 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