summaryrefslogtreecommitdiffstats
path: root/gitconfig
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2009-09-12 18:06:16 -0500
committerJesse Luehrs <doy@tozt.net>2009-09-12 18:06:16 -0500
commit5383bba6a5adc538dfbeb806284a25d4496d5b61 (patch)
treebec4fe8096fc6ad209a5a72f86af78ecb5261121 /gitconfig
parentd420db0b2a1d840e11e9eabaa7655d8305cc8bf8 (diff)
downloadconf-5383bba6a5adc538dfbeb806284a25d4496d5b61.tar.gz
conf-5383bba6a5adc538dfbeb806284a25d4496d5b61.zip
add some git aliases for branch manipulation
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 2ecb6f5..2478573 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,6 +5,9 @@
pushall = !git push origin master && git push github master
amend = commit --amend
record = !git add -p && git commit
+ rebase-branch = !git rebase -i $(git merge-base master HEAD)
+ diff-branch = !git diff $(git merge-base master HEAD)..HEAD
+ log-branch = !git log $(git merge-base master HEAD)..HEAD
[github]
user = doy
[color]