tree e1c42e6af69e4e9f2b8b6106cbaa70bd4c07a283
parent 6e7f4239832abe6b8694695af4f312bb8a02badc
author John Schulz <github.com@jfsiii.org> 1289497532 -0500
committer John Schulz <github.com@jfsiii.org> 1289497532 -0500

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