[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
- 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
+ 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]
[user]
name = Pierre Habouzit
- email = madcoder@debian.org
+ email = phabouzit@apple.com
[color]
ui = auto
[merge]
verbosity = 1
conflictstyle = diff3
+ tool = opendiff
[clean]
requireForce = false
[pack]
[url "ssh://git.debian.org"]
pushInsteadOf = git://git.debian.org
pushInsteadOf = git.debian.org:
-
[branch "*"]
mergeoptions = -Xpatience
+[credential]
+ helper = osxkeychain