Sync with maint

* maint:
  completion: zsh: don't override suffix on _detault
  Documentation/git-commit: Typo under --edit
This commit is contained in:
Junio C Hamano 2013-05-03 15:17:38 -07:00
commit 1c937682c2
2 changed files with 3 additions and 3 deletions

View file

@ -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::

View file

@ -198,7 +198,7 @@ _git ()
emulate ksh -c __${service}_main
fi
let _ret && _default -S '' && _ret=0
let _ret && _default && _ret=0
return _ret
}