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

diff --git a/gitconfig b/gitconfig
index 9ab6411..81fa0a7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,17 +3,12 @@
 
 [alias]
     co=checkout -m
-    ci=commit -s
+    ci=commit
     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
+    amend=commit --amend
+    squash=commit --amend -C HEAD
     unstage=reset HEAD --
     track=add -N
     untrack=rm --cached
@@ -21,12 +16,18 @@
 [core]
     #editor=gvim -f
     editor=vim
-    excludesfile=/home/madcoder/.git-excludes
+    excludesfile=~madcoder/.git-excludes
     preloadindex=true
 
+[notes]
+    displayRef = refs/notes/*
+
+[push]
+    default = upstream
+
 [user]
-    name  = Pierre Habouzit
-    email = madcoder@debian.org
+    name = Pierre Habouzit
+    email = phabouzit@apple.com
 
 [color]
     ui     = auto
@@ -35,6 +36,7 @@
     status = auto
     pager  = true
     interactive = auto
+    grep   = auto
 
 [color "diff"]
     meta = green
@@ -49,11 +51,37 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
+    tool = opendiff
 [clean]
     requireForce = false
 [pack]
     threads = 0
+[advice]
+    pushNonFastForward = false
+    statusHints = false
 [status]
     submodulesummary = 1
-[push]
-    default = tracking
+
+[merge "dpkg-mergechangelogs"]
+    name = debian/changelog merge driver
+    driver = dpkg-mergechangelogs -m %O %A %B %A
+[sendemail]
+    aliasesfile = /home/madcoder/.mutt/aliases
+    aliasfiletype = mutt
+
+[url "gitolite@git.corp:"]
+    insteadOf = ssh://git.corp/srv/git/
+    insteadOf = git.corp:/srv/git/
+[reviewboard]
+    url = http://reviews.corp/
+[url "git://anonscm.debian.org"]
+    insteadOf = git://git.debian.org
+    insteadOf = git.debian.org:
+[url "ssh://git.debian.org"]
+    pushInsteadOf = git://git.debian.org
+    pushInsteadOf = git.debian.org:
+[branch "*"]
+    mergeoptions = -Xpatience
+[credential]
+	helper = osxkeychain