summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-15 10:24:44 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-15 10:24:44 -0800
commit6b34d6e692b751e7f62ea7bdce86a641c9b72468 (patch)
tree2820e2aeeedc682b65eba19707609f959511a3b5
parentMerge branch 'as/maint-doc-fix-no-post-rewrite' (diff)
parentDocument 'git commit --no-edit' explicitly (diff)
downloadtgif-6b34d6e692b751e7f62ea7bdce86a641c9b72468.tar.xz
Merge branch 'mm/maint-doc-commit-edit'
* mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
-rw-r--r--Documentation/git-commit.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index b620aae411..7bdb039d5e 100644
--- 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