Created
July 9, 2013 03:19
-
-
Save zdk/5954431 to your computer and use it in GitHub Desktop.
When you need git merge --dry-run
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git merge --no-commit --no-ff $BRANCH && git reset --hard HEAD |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Instead of
git reset --hard HEAD
usegit merge --abort