update dotfiles

[~madcoder/dotfiles.git] / gitconfig

diff --git a/gitconfig b/gitconfig
index 892be41..65fb164 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -9,12 +9,10 @@
     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
     unstage=reset HEAD --
     track=add -N
     untrack=rm --cached
@@ -28,8 +26,11 @@
     excludesfile=/home/madcoder/.git-excludes
     preloadindex=true
 
+[notes]
+    displayRef = refs/notes/*
+
 [push]
-    default = tracking
+    default = upstream
 
 [user]
     name = Pierre Habouzit
@@ -87,3 +88,5 @@
     pushInsteadOf = git://git.debian.org
     pushInsteadOf = git.debian.org:
 
+[branch "*"]
+    mergeoptions = -Xpatience