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

* mm/maint-doc-commit-edit:
  Document 'git commit --no-edit' explicitly
This commit is contained in:
Junio C Hamano 2012-11-20 10:14:55 -08:00
commit cf48960b6d

View File

@ -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