Sync with maint

* maint: completion: zsh: don't override suffix on _detault Documentation/git-commit: Typo under --edit
git-mirror · May 3, 2013 · 1c93768 · 1c93768
2 parents de0977d + 571cdfd
commit 1c93768
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -198,7 +198,7 @@ _git ()
 		emulate ksh -c __${service}_main
 	fi
 
-	let _ret && _default -S '' && _ret=0
+	let _ret && _default && _ret=0
 	return _ret
 }