Skip to content

Instantly share code, notes, and snippets.

@ajsharp
Created May 1, 2011 00:53
Show Gist options
  • Save ajsharp/950152 to your computer and use it in GitHub Desktop.
Save ajsharp/950152 to your computer and use it in GitHub Desktop.
#!/bin/sh -x
# git name-rev is fail
CURRENT=`git branch | grep '\*' | awk '{print $2}'`
git checkout master
git pull --rebase origin master
git checkout ${CURRENT}
git rebase master
#!/bin/sh -x
# git name-rev is fail
CURRENT=`git branch | grep '\*' | awk '{print $2}'`
git checkout master
git merge --no-ff ${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