summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-02 13:18:22 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-02 13:18:22 -0700
commitc14bd209318f6801aa3ebe36f3f6130459a6beeb (patch)
tree75cbdb629a614cd569e7b2653e5a0f1380b55540 /Documentation
parentfee6bc5f031a9d18d09463d96d7df562d62438f7 (diff)
parentb2cd17b925a43c232955a53276caf0e20bfd9095 (diff)
downloadgit-c14bd209318f6801aa3ebe36f3f6130459a6beeb.tar.gz
Merge branch 'tr/maint-format-patch-empty-output'
* tr/maint-format-patch-empty-output: Document negated forms of format-patch --to --cc --add-headers t4014: "no-add-headers" is actually called "no-add-header" t4014: invoke format-patch with --stdout where intended t4014: check for empty files from git format-patch --stdout
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-format-patch.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index d13c9b23f7..6ea9be775c 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -166,15 +166,22 @@ will want to ensure that threading is disabled for `git send-email`.
--to=<email>::
Add a `To:` header to the email headers. This is in addition
to any configured headers, and may be used multiple times.
+ The negated form `--no-to` discards all `To:` headers added so
+ far (from config or command line).
--cc=<email>::
Add a `Cc:` header to the email headers. This is in addition
to any configured headers, and may be used multiple times.
+ The negated form `--no-cc` discards all `Cc:` headers added so
+ far (from config or command line).
--add-header=<header>::
Add an arbitrary header to the email headers. This is in addition
to any configured headers, and may be used multiple times.
- For example, `--add-header="Organization: git-foo"`
+ For example, `--add-header="Organization: git-foo"`.
+ The negated form `--no-add-header` discards *all* (`To:`,
+ `Cc:`, and custom) headers added so far from config or command
+ line.
--cover-letter::
In addition to the patches, generate a cover letter file