Skip to content

Instantly share code, notes, and snippets.

@zdk

zdk/git-merge-dry-run

Created July 9, 2013 03:19
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save zdk/5954431 to your computer and use it in GitHub Desktop.
Save zdk/5954431 to your computer and use it in GitHub Desktop.
Download ZIP
When you need git merge --dry-run
Raw
git-merge-dry-run
git merge --no-commit --no-ff $BRANCH && git reset --hard HEAD
@georgo
Copy link

georgo commented Oct 19, 2016

Instead of git reset --hard HEAD use git merge --abort

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment