Skip to content

Instantly share code, notes, and snippets.

@cwsaylor
Created November 7, 2012 19:17
Show Gist options
  • Star 10 You must be signed in to star a gist
  • Fork 9 You must be signed in to fork a gist
  • Save cwsaylor/4033753 to your computer and use it in GitHub Desktop.
Save cwsaylor/4033753 to your computer and use it in GitHub Desktop.
Merge master into current branch
#!/bin/sh -x
CURRENT=`git branch | grep "*" | awk '{print $2}'`
git checkout master
git fetch
git merge origin/master
git checkout ${CURRENT}
git merge master ${CURRENT}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment