From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Nov 2012 18:24:44 +0000 (-0800)
Subject: Merge branch 'mm/maint-doc-commit-edit'
X-Git-Tag: v1.8.1-rc0~62
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6b34d6e692b751e7f62ea7bdce86a641c9b72468?hp=-c

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

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

6b34d6e692b751e7f62ea7bdce86a641c9b72468
diff --combined Documentation/git-commit.txt
index b620aae411,694c56f783..7bdb039d5e
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -13,7 -13,7 +13,7 @@@ SYNOPSI
  	   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
  	   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
  	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
 -	   [-i | -o] [--] [<file>...]
 +	   [-i | -o] [-S[<keyid>]] [--] [<file>...]
  
  DESCRIPTION
  -----------
@@@ -109,10 -109,6 +109,10 @@@ OPTION
  	format. See linkgit:git-status[1] for details. Implies
  	`--dry-run`.
  
 +--long::
 +	When doing a dry-run, give the output in a the long-format.
 +	Implies `--dry-run`.
 +
  -z::
  --null::
  	When showing `short` or `porcelain` status output, terminate
@@@ -188,6 -184,11 +188,11 @@@
  	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
@@@ -197,6 -198,10 +202,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:
@@@ -213,9 -218,6 +218,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,
@@@ -279,10 -281,6 +284,10 @@@ configuration variable documented in li
  	commit message template when using an editor to prepare the
  	default commit message.
  
 +-S[<keyid>]::
 +--gpg-sign[=<keyid>]::
 +	GPG-sign commit.
 +
  \--::
  	Do not interpret any more arguments as options.