Merge branch 'mm/maint-doc-commit-edit'

* mm/maint-doc-commit-edit:
  Document 'git commit --no-edit' explicitly

diff --cc Documentation/git-commit.txt
Simple merge