Merge branch 'mc/commit-doc-grammofix' into maint

Doc grammar fix.

* mc/commit-doc-grammofix:
  Documentation/git-commit: grammofix
This commit is contained in:
Junio C Hamano 2015-06-16 14:33:49 -07:00
commit afd647c55f

View File

@ -94,7 +94,7 @@ OPTIONS
--reset-author:: --reset-author::
When used with -C/-c/--amend options, or when committing after a When used with -C/-c/--amend options, or when committing after a
a conflicting cherry-pick, declare that the authorship of the a conflicting cherry-pick, declare that the authorship of the
resulting commit now belongs of the committer. This also renews resulting commit now belongs to the committer. This also renews
the author timestamp. the author timestamp.
--short:: --short::