Skip to content

Instantly share code, notes, and snippets.

@reinh
Forked from rick/hack
Created August 28, 2008 02:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save reinh/7639 to your computer and use it in GitHub Desktop.
Save reinh/7639 to your computer and use it in GitHub Desktop.
#!/bin/sh -x
# hack
CURRENT=`git branch | grep "\*" | awk "{print $2}"`
git checkout master
git pull origin master
git checkout ${CURRENT}
git rebase master
#!/bin/sh -x
# ship
CURRENT=`git branch | grep "\*" | awk "{print $2}"`
git checkout master
git merge ${CURRENT}
git push origin master
git checkout ${CURRENT}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment