Git merge without auto commit

Question

Is it possible to do a git merge, but without a commit?

\"man git merge\" says this:

With --no-commit perform the merge but pretend the          


        

Answer 1

I prefer this way so I don't need to remember any rare parameters.

git merge branch_name

It will then say your branch is ahead by "#" commits, you can now pop these commits off and put them into the working changes with the following:

git reset @~#

For example if after the merge it is 1 commit ahead, use:

git reset @~1

Note: On Windows, quotes are needed. (As Josh noted in comments) eg:

git reset "@~1"