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

* mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
git-mirror · Nov 15, 2012 · 6b34d6e · 6b34d6e
2 parents 80b2234 + ae45320
commit 6b34d6e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
@@ -188,6 +188,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