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
frag = yellow
old = magenta
new = bold cyan
-; message = bold
[color "status"]
header = bold blue
untracked = bold yellow
[merge]
verbosity = 1
+ conflictstyle = diff3
[clean]
requireForce = false
[pack]
threads = 0
[status]
submodulesummary = 1
+[push]
+ default = tracking