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
+ 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
unstage=reset HEAD --
track=add -N
untrack=rm --cached
+[merge]
+ tool=diffuse
+
[core]
#editor=gvim -f
editor=vim
excludesfile=/home/madcoder/.git-excludes
preloadindex=true
+[notes]
+ displayRef = refs/notes/*
+
+[push]
+ default = upstream
+
[user]
- name = Pierre Habouzit
+ name = Pierre Habouzit
email = madcoder@debian.org
[color]
status = auto
pager = true
interactive = auto
+ grep = auto
[color "diff"]
meta = green
untracked = bold yellow
[merge]
verbosity = 1
+ conflictstyle = diff3
[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