Do not misidentify "git merge foo HEAD" as an old-style invocation