1
0
mirror of https://github.com/git/git.git synced 2025-04-03 10:10:09 +00:00

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
Documentation
contrib/completion

@ -197,8 +197,8 @@ variable (see linkgit:git-config[1]).
-e:: -e::
--edit:: --edit::
The message taken from file with `-F`, command line with The message taken from file with `-F`, command line with
`-m`, and from file with `-C` are usually used as the `-m`, and from commit object with `-C` are usually used as
commit log message unmodified. This option lets you the commit log message unmodified. This option lets you
further edit the message taken from these sources. further edit the message taken from these sources.
--no-edit:: --no-edit::

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