diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-03 15:17:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-03 15:17:38 -0700 |
| commit | 1c937682c20970c83d17957ee0460d596eb1b009 (patch) | |
| tree | db0aaf20431c3487abfe4826c65393216f39bd46 | |
| parent | de0977d528055bac8a3ae666652f16bf39363ddc (diff) | |
| parent | 571cdfd4e0a4cc24e215a5d5f0cb24292a9d7929 (diff) | |
| download | git-1c937682c20970c83d17957ee0460d596eb1b009.tar.gz | |
Sync with maint
* maint:
completion: zsh: don't override suffix on _detault
Documentation/git-commit: Typo under --edit
| -rw-r--r-- | Documentation/git-commit.txt | 4 | ||||
| -rw-r--r-- | contrib/completion/git-completion.zsh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 9b1be5581d..8172938653 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:: diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 49f0cb8f69..2565d2eef4 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -198,7 +198,7 @@ _git () emulate ksh -c __${service}_main fi - let _ret && _default -S '' && _ret=0 + let _ret && _default && _ret=0 return _ret } |