Skip to content

Instantly share code, notes, and snippets.

@chriscasola

chriscasola/undo-ff-merge

Created February 9, 2013 22:34
Show Gist options
  • Save chriscasola/4747417 to your computer and use it in GitHub Desktop.
Save chriscasola/4747417 to your computer and use it in GitHub Desktop.
Download ZIP
Undo a fast-forward merge
Raw
undo-ff-merge
git reflog show master
git reset --keep master@{1}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment