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?ds=inline;hp=-c

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

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

cf48960b6dd5c0d8b8767fa0088bd166e619de57
diff --combined Documentation/git-commit.txt
index 28a5aeba2f,694c56f783..15cec8601c
--- a/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,