Skip to content

Instantly share code, notes, and snippets.

@slowbrewedmacchiato

slowbrewedmacchiato/git-dry-merge.sh

Created March 8, 2021 03:53
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save slowbrewedmacchiato/1842762c7434d17c6eec63d0171b645e to your computer and use it in GitHub Desktop.
Save slowbrewedmacchiato/1842762c7434d17c6eec63d0171b645e to your computer and use it in GitHub Desktop.
Download ZIP
HowTo: Git Dry Merge
Raw
git-dry-merge.sh
$ git merge --no-commit --no-ff $BRANCH
$ git pull $REMOTE $BRANCH
# uh oh, that wasn't right
$ git reset --hard ORIG_HEAD
# all is right with the world
#see diff between current master and remote branch
$ git diff master origin/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment