From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Nov 2012 18:14:55 +0000 (-0800)
Subject: Merge branch 'mm/maint-doc-commit-edit' into maint
X-Git-Tag: v1.8.0.1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cf48960b6dd5c0d8b8767fa0088bd166e619de57?hp=cdcd79321390b41df452c48c5ba9d1e4cc23a801

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

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

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 28a5aeba2f..15cec8601c 100644
--- 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