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

diff --git a/gitconfig b/gitconfig
index 892be41..81fa0a7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,37 +3,31 @@
 
 [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 --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose -C -C -M --patience --to
-    is-send=send-email --no-chain-reply-to --suppress-cc all --suppress-from --no-signed-off-by-cc --annotate --compose --patience -C -C -M --to corp.software.review@news.intersec.com
-    stage=add
+    amend=commit --amend
+    squash=commit --amend -C HEAD
     unstage=reset HEAD --
     track=add -N
     untrack=rm --cached
 
-[merge]
-    tool=diffuse
-
 [core]
     #editor=gvim -f
     editor=vim
-    excludesfile=/home/madcoder/.git-excludes
+    excludesfile=~madcoder/.git-excludes
     preloadindex=true
 
+[notes]
+    displayRef = refs/notes/*
+
 [push]
-    default = tracking
+    default = upstream
 
 [user]
     name = Pierre Habouzit
-    email = madcoder@debian.org
+    email = phabouzit@apple.com
 
 [color]
     ui     = auto
@@ -58,6 +52,7 @@
 [merge]
     verbosity = 1
     conflictstyle = diff3
+    tool = opendiff
 [clean]
     requireForce = false
 [pack]
@@ -86,4 +81,7 @@
 [url "ssh://git.debian.org"]
     pushInsteadOf = git://git.debian.org
     pushInsteadOf = git.debian.org:
-
+[branch "*"]
+    mergeoptions = -Xpatience
+[credential]
+	helper = osxkeychain