git-commit: Allow to amend a merge commit that does not change the tree