aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-03 15:17:38 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-03 15:17:38 -0700
commit1c937682c20970c83d17957ee0460d596eb1b009 (patch)
treedb0aaf20431c3487abfe4826c65393216f39bd46 /Documentation
parentde0977d528055bac8a3ae666652f16bf39363ddc (diff)
parent571cdfd4e0a4cc24e215a5d5f0cb24292a9d7929 (diff)
downloadgit-1c937682c20970c83d17957ee0460d596eb1b009.tar.gz
git-1c937682c20970c83d17957ee0460d596eb1b009.tar.xz
Sync with maint
* maint: completion: zsh: don't override suffix on _detault Documentation/git-commit: Typo under --edit
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9b1be5581..817293865 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -197,8 +197,8 @@ variable (see linkgit:git-config[1]).
-e::
--edit::
The message taken from file with `-F`, command line with
- `-m`, and from file with `-C` are usually used as the
- commit log message unmodified. This option lets you
+ `-m`, and from commit object with `-C` are usually used as
+ the commit log message unmodified. This option lets you
further edit the message taken from these sources.
--no-edit::