git mncnf

Merge with no autocommit, and with no fast-forward

Git alias:

mncnf = merge --no-commit --no-ff

Example:

git mncnf

This does a merge, but without autocommit, and with a commit even if the merge resolves as a fast-forward.