git up alias and git up -i documentation

This commit is contained in:
Dan Croak 2013-04-14 10:57:44 -07:00
parent 830f4fed17
commit 32e79b642f
2 changed files with 3 additions and 1 deletions

View file

@ -90,6 +90,8 @@ configuration:
* Adds a `create-branch` alias to create feature branches.
* Adds a `delete-branch` alias to delete feature branches.
* Adds a `merge-branch` alias to merge feature branches into master.
* Adds an `up` alias to fetch and rebase `origin/master` into the feature
branch. Use `git up -i` for interactive rebases.
Shell aliases and scripts:

View file

@ -12,8 +12,8 @@
delete-branch = !sh -c 'git push origin :refs/heads/$1 && git remote prune origin && git branch -D $1' -
merge-branch = !git checkout master && git merge @{-1}
pr = !hub pull-request
rebase-origin = !git fetch origin && git rebase origin/master
st = status
up = !git fetch origin && git rebase origin/master
[core]
excludesfile = ~/.gitignore
autocrlf = input