X-Git-Url: http://git.madism.org/?p=~madcoder%2Fdotfiles.git;a=blobdiff_plain;f=gitconfig;h=3855ae96ae07aa1cfa49dc24b4b00a9eb9a72312;hp=095e84d31360058a2f9fe80c18819374fbc852c1;hb=1f66b92bd417b2e96d9b819a9ca256cfb4e8fe98;hpb=56894d8e51e7d0ca54c798431fb3428245f6ce13

diff --git a/gitconfig b/gitconfig
index 095e84d..3855ae9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,57 +1,75 @@
 [madcoder]
-	up-gitk=true
+    up-gitk=true
 
 [alias]
-	co=checkout -m
-	ci=commit -s
-	st=!git -p status
-	pop=reset HEAD~1
-	unstash=stash apply
-	amend=commit -s --amend
-	squash=commit -s --amend -C HEAD
-	p=!git push origin HEAD
-	debtag=!git tag -f -a -s -m `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'` `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'`
-        b64=commit -sm'64bits fix'
-	send=send-email --annotate --compose -C -C -M -n --to
-        stage=add
-        unstage=reset HEAD --
-        track=add -N
-        untrack=rm --cached
+    co=checkout -m
+    ci=commit -s
+    st=!git -p status
+    pop=reset HEAD~1
+    unstash=stash apply
+    amend=commit -s --amend
+    squash=commit -s --amend -C HEAD
+    p=!git push origin HEAD
+    debtag=!git tag -f -a -s -m `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'` `git-symbolic-ref HEAD | sed -e 's~refs/heads/~~'`/`dpkg-parsechangelog | sed -n 's/^Version: \\(.*:\\)\\?//p'`
+    b64=commit -sm'64bits fix'
+    send=send-email --annotate --compose -C -C -M -n --to
+    stage=add
+    unstage=reset HEAD --
+    track=add -N
+    untrack=rm --cached
+
+[merge]
+    tool=diffuse
 
 [core]
-        #editor=gvim -f
-        editor=vim
-        excludesfile=/home/madcoder/.git-excludes
+    #editor=gvim -f
+    editor=vim
+    excludesfile=/home/madcoder/.git-excludes
+    preloadindex=true
+
+[push]
+    default = tracking
 
 [user]
-	name  = Pierre Habouzit
-	email = madcoder@debian.org
+    name  = Pierre Habouzit
+    email = madcoder@debian.org
 
 [color]
-        ui     = auto
-	diff   = auto
-	branch = auto
-	status = auto
-	pager  = true
-        interactive = auto
+    ui     = auto
+    diff   = auto
+    branch = auto
+    status = auto
+    pager  = true
+    interactive = auto
+    grep   = auto
 
 [color "diff"]
-	meta = green
-	frag = yellow
-	old = magenta
-	new = bold cyan
-;	message = bold
+    meta = green
+    frag = yellow
+    old = magenta
+    new = bold cyan
 
 [color "status"]
-	header = bold blue
-	added  = green
-	changed = bold red
-	untracked = bold yellow
+    header = bold blue
+    added  = green
+    changed = bold red
+    untracked = bold yellow
 [merge]
-	verbosity = 1
+    verbosity = 1
+    conflictstyle = diff3
 [clean]
-	requireForce = false
+    requireForce = false
 [pack]
-	threads = 0
+    threads = 0
 [status]
-	submodulesummary = 1
+    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