Skip to content

Instantly share code, notes, and snippets.

@rick
Created August 28, 2008 01:35
Show Gist options
  • Save rick/7633 to your computer and use it in GitHub Desktop.
Save rick/7633 to your computer and use it in GitHub Desktop.
#!/bin/sh -x
CURRENT=`git branch | grep '\*' | awk '{print $2}'`
git checkout master
git pull origin master
git checkout ${CURRENT}
git rebase master
#!/bin/sh -x
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