summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-24 12:57:55 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-24 12:57:55 -0700
commit75d4476f52f734bb1a01be9dfc99b1797cb3bdfe (patch)
tree77a0813c5df57ac6a4777bdd0eec2684e55c0e3f /Documentation
parentce9e6178d31a61db05acd2c7311651d1da31d18f (diff)
parent2c7ee986c70e276531881d8730b9bb299b30d5c0 (diff)
downloadgit-75d4476f52f734bb1a01be9dfc99b1797cb3bdfe.tar.gz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-send-email.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 9b200b379b..f7a069bb92 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -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`
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
is separated from the body by a line with '-- ' on it. If the
signature option is omitted the signature defaults to the Git version
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 642d0ef199..9d66166f69 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -89,7 +89,7 @@ See the CONFIGURATION section for `sendemail.multiEdit`.
reply to the given Message-Id, which avoids breaking threads to
provide a new patch series.
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
second and subsequent patches will be replies to the first one like in the