Merge branch 'ab/doc-no-option-notation-fix' into maint

Doc fix.

* ab/doc-no-option-notation-fix:
  doc: change erroneous --[no]-whatever into --[no-]whatever
This commit is contained in:
Junio C Hamano 2017-03-24 12:57:55 -07:00
commit 75d4476f52
2 changed files with 2 additions and 2 deletions

View File

@ -239,7 +239,7 @@ keeping them as Git notes allows them to be maintained between versions
of the patch series (but see the discussion of the `notes.rewrite` of the patch series (but see the discussion of the `notes.rewrite`
configuration options in linkgit:git-notes[1] to use this workflow). configuration options in linkgit:git-notes[1] to use this workflow).
--[no]-signature=<signature>:: --[no-]signature=<signature>::
Add a signature to each message produced. Per RFC 3676 the signature Add a signature to each message produced. Per RFC 3676 the signature
is separated from the body by a line with '-- ' on it. If the is separated from the body by a line with '-- ' on it. If the
signature option is omitted the signature defaults to the Git version signature option is omitted the signature defaults to the Git version

View File

@ -89,7 +89,7 @@ See the CONFIGURATION section for `sendemail.multiEdit`.
reply to the given Message-Id, which avoids breaking threads to reply to the given Message-Id, which avoids breaking threads to
provide a new patch series. provide a new patch series.
The second and subsequent emails will be sent as replies according to The second and subsequent emails will be sent as replies according to
the `--[no]-chain-reply-to` setting. the `--[no-]chain-reply-to` setting.
+ +
So for example when `--thread` and `--no-chain-reply-to` are specified, the So for example when `--thread` and `--no-chain-reply-to` are specified, the
second and subsequent patches will be replies to the first one like in the second and subsequent patches will be replies to the first one like in the