Skip to content

Instantly share code, notes, and snippets.

@roychri
Created September 7, 2013 17:13
Show Gist options
  • Save roychri/6477368 to your computer and use it in GitHub Desktop.
Save roychri/6477368 to your computer and use it in GitHub Desktop.
# While on master which is up to date.
git checkout -b feature9
# <work>, <commit>, <work>, <commit>, ...
git fetch origin/master
git rebase master
git checkout master
git pull
git rebase feature9
# Oopps, I wanted to do -i
git reglog
# Found the HEAD before the rebase
git reset --HARD HEAD@{19}
git rebase -i feature 9
# Get a noop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment