Merge without Automatically Checking In

1 Dec 2014

This will prevent auto-commit, but will still have files already added to your index / staging area:

git merge --no-commit --no-ff REF

This will pull all the files out of your staging area and into your working directory:

git reset HEAD

NOW you can edit at will and then commit.