summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-20 18:14:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-11-20 18:14:55 (GMT)
commitcf48960b6dd5c0d8b8767fa0088bd166e619de57 (patch)
tree768fbd43352e95a6cdf42d68d2023ea1981c537f /Documentation
parentcdcd79321390b41df452c48c5ba9d1e4cc23a801 (diff)
parentae45320c40e255362b39f6ff609f759927fbd096 (diff)
downloadgit-cf48960b6dd5c0d8b8767fa0088bd166e619de57.zip
git-cf48960b6dd5c0d8b8767fa0088bd166e619de57.tar.gz
git-cf48960b6dd5c0d8b8767fa0088bd166e619de57.tar.bz2
Merge branch 'mm/maint-doc-commit-edit' into maint
* mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly
Diffstat (limited to 'Documentation')
-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 28a5aeb..15cec86 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