Skip to content

Instantly share code, notes, and snippets.

@bhachauk
Last active July 24, 2018 09:12
Show Gist options
  • Save bhachauk/03df335ddcb0e7ecc5a8f88abf12a6f5 to your computer and use it in GitHub Desktop.
Save bhachauk/03df335ddcb0e7ecc5a8f88abf12a6f5 to your computer and use it in GitHub Desktop.
git merge with no fast forward and no commit :octocat:
git merge --no-commit --no-ff newbranch
git diff --cached
git merge --abort
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment