Git: after preparing a real merge commit, how to create a simple commit?
- by mklhmnn
After invoking git merge --no-commit <commit>, performing a commit will result in a merge commit with two (or more) parents. What command to invoke to create a simple commit instead (without having to re-perform the merge command with the --squash option)?