X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-format-patch.txt;h=111d7c60bf1832bbfc27f8b819da77b8761236da;hb=7891a2811dc7cae375e34c9f4fa6c8ecaef0f6d7;hp=59f34b9f0d2f4fe74fa5d90bb53393c88d36476b;hpb=3eee9c6dbebcf6341ad202f7dd4d416ef3fcba5e;p=git.git
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 59f34b9f0..111d7c60b 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -9,8 +9,9 @@ git-format-patch - Prepare patches for e-mail submission
SYNOPSIS
--------
[verse]
-'git-format-patch' [-n | -k] [-o
| --stdout] [--attach] [--thread]
- [-s | --signoff] [--diff-options] [--start-number ]
+'git-format-patch' [-n | -k] [-o | --stdout] [--thread]
+ [--attach[=] | --inline[=]]
+ [-s | --signoff] [] [--start-number ]
[--in-reply-to=Message-Id] [--suffix=.]
[--ignore-if-in-upstream]
[..]
@@ -46,6 +47,8 @@ reference.
OPTIONS
-------
+include::diff-options.txt[]
+
-o|--output-directory ::
Use to store the resulting files, instead of the
current working directory.
@@ -68,8 +71,15 @@ OPTIONS
Print all commits to the standard output in mbox format,
instead of creating a file for each one.
---attach::
- Create attachments instead of inlining patches.
+--attach[=]::
+ Create multipart/mixed attachment, the first part of
+ which is the commit message and the patch itself in the
+ second part, with "Content-Disposition: attachment".
+
+--inline[=]::
+ Create multipart/mixed attachment, the first part of
+ which is the commit message and the patch itself in the
+ second part, with "Content-Disposition: inline".
--thread::
Add In-Reply-To and References headers to make the second and