XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `gmu` (git merge upstream) alias 

* Pull in `origin` & `upstream` and merge them into `upstream/master`
from http://www.gitready.com/intermediate/2009/02/12/easily-fetching-upstream-changes.html
pull/33/head
John Schulz 2010-11-11 12:45:32 -05:00
parent 6e7f423983
commit 760cc8be63
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aliases/git.aliases.bash
View File

@ -23,6 +23,7 @@ alias gcp='git cherry-pick'
alias gco='git checkout' alias gco='git checkout'
alias gexport='git archive --format zip --output' alias gexport='git archive --format zip --output'
alias gdel='git branch -D' alias gdel='git branch -D'
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
case $OSTYPE in case $OSTYPE in
linux*) linux*)
@ -61,7 +62,8 @@ function git-help() {
echo " gcp = git cherry-pick" echo " gcp = git cherry-pick"
echo " gco = git checkout" echo " gco = git checkout"
echo " gexport = git git archive --format zip --output" echo " gexport = git git archive --format zip --output"
echo " gdel = git branch -D" echo " gdel = git branch -D"
echo " gpo = git push origin" echo " gpo = git push origin"
echo " gmu = git fetch origin -v; git fetch upstream -v; git merge upstream/master"
echo echo
} }