From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jun 2015 21:33:49 +0000 (-0700)
Subject: Merge branch 'mc/commit-doc-grammofix' into maint
X-Git-Tag: v2.4.4~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afd647c55f19b34c1c605f099720dcec49c4e24a;p=thirdparty%2Fgit.git

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

Doc grammar fix.

* mc/commit-doc-grammofix:
  Documentation/git-commit: grammofix
---

afd647c55f19b34c1c605f099720dcec49c4e24a
diff --cc Documentation/git-commit.txt
index 617dea083e,ecabf1ac36..904dafa0f7
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -78,46 -69,10 +78,46 @@@ OPTION
  	Like '-C', but with '-c' the editor is invoked, so that
  	the user can further edit the commit message.
  
 +--fixup=<commit>::
 +	Construct a commit message for use with `rebase --autosquash`.
 +	The commit message will be the subject line from the specified
 +	commit with a prefix of "fixup! ".  See linkgit:git-rebase[1]
 +	for details.
 +
 +--squash=<commit>::
 +	Construct a commit message for use with `rebase --autosquash`.
 +	The commit message subject line is taken from the specified
 +	commit with a prefix of "squash! ".  Can be used with additional
 +	commit message options (`-m`/`-c`/`-C`/`-F`). See
 +	linkgit:git-rebase[1] for details.
 +
  --reset-author::
 -	When used with -C/-c/--amend options, declare that the
 -	authorship of the resulting commit now belongs to the committer.
 -	This also renews the author timestamp.
 +	When used with -C/-c/--amend options, or when committing after a
 +	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.
 +
 +--short::
 +	When doing a dry-run, give the output in the short-format. See
 +	linkgit:git-status[1] for details. Implies `--dry-run`.
 +
 +--branch::
 +	Show the branch and tracking info even in short-format.
 +
 +--porcelain::
 +	When doing a dry-run, give the output in a porcelain-ready
 +	format. See linkgit:git-status[1] for details. Implies
 +	`--dry-run`.
 +
 +--long::
 +	When doing a dry-run, give the output in a the long-format.
 +	Implies `--dry-run`.
 +
 +-z::
 +--null::
 +	When showing `short` or `porcelain` status output, terminate
 +	entries in the status output with NUL, instead of LF. If no
 +	format is given, implies the `--porcelain` output format.
  
  -F <file>::
  --file=<file>::