Skip to content

Instantly share code, notes, and snippets.

@yulgit1
Last active November 17, 2015 21:03
Show Gist options
  • Save yulgit1/429f504b38e515d2725a to your computer and use it in GitHub Desktop.
Save yulgit1/429f504b38e515d2725a to your computer and use it in GitHub Desktop.
undo commit and rebase
git checkout extract-metadata2
git reset --hard HEAD^
git checkout master
git pull <upstream> master
git checkout extract-metadata2
git rebase master
<fix conflicts> if any
git push --force <origin>
where
extract-metadata2 = topic branch
<upstream> = hydra-labs
<origin> = your github acct
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment