From: John Schulz <github.com@jfsiii.org>
Date: Thu, 11 Nov 2010 17:45:32 +0000 (-0500)
Subject: Add `gmu` (git merge upstream) alias
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=760cc8be63180ab102af5e81684af74fd74cfe10;p=common%2Fbash_it.git

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
---

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