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

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 28a5aeba2f6c4c052a143874d267b18c84ad813a..15cec8601c6953e2526ca8d7ffcbee491885875a 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -184,6 +184,11 @@ OPTIONS
        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