Sync with maint

* maint:
completion: zsh: don't override suffix on _detault
Documentation/git-commit: Typo under --edit

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 9b1be5581d34b9911e3d60f23dcdda440d3bc17f..8172938653552c0b4cc3f3154195a7d83721a5a3 100644 (file)
--- 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 49f0cb8f69d747ddd5bad353277ae741855eff5d..2565d2eef4cd23ac2137d4b047300ebc4078fcdb 100644 (file)
--- 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
 }