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

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

diff --combined Documentation/git-commit.txt
index 28a5aeba2f6c4c052a143874d267b18c84ad813a,694c56f78358f922c2b247d87d2ac7a6298656da..15cec8601c6953e2526ca8d7ffcbee491885875a
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -184,6 -184,11 +184,11 @@@ OPTION
        commit log message unmodified.  This option lets you
        further edit the message taken from these sources.
  
+ --no-edit::
+       Use the selected commit message without launching an editor.
+       For example, `git commit --amend --no-edit` amends a commit
+       without changing its commit message.
+ 
  --amend::
        Used to amend the tip of the current branch. Prepare the tree
        object you would want to replace the latest commit as usual
@@@ -193,6 -198,10 +198,6 @@@
        current tip -- if it was a merge, it will have the parents of
        the current tip as parents -- so the current top commit is
        discarded.
 -
 ---no-post-rewrite::
 -      Bypass the post-rewrite hook.
 -
  +
  --
  It is a rough equivalent for:
@@@ -209,9 -218,6 +214,9 @@@ You should understand the implications 
  amend a commit that has already been published.  (See the "RECOVERING
  FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
  
 +--no-post-rewrite::
 +      Bypass the post-rewrite hook.
 +
  -i::
  --include::
        Before making a commit out of staged contents so far,