X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-format-patch.txt;h=a33d157b970740aa7d056ebb459350de89513a8b;hb=ffcc952b33575e28b971d63ba2b7e46b7726a257;hp=59f34b9f0d2f4fe74fa5d90bb53393c88d36476b;hpb=b4d2b04c9b6dc42c0bcf0513b9d8f731ec26db82;p=git.git
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 59f34b9f0..a33d157b9 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -9,11 +9,13 @@ 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 ]
- [--in-reply-to=Message-Id] [--suffix=.]
- [--ignore-if-in-upstream]
- [..]
+'git-format-patch' [-n | -k] [-o | --stdout] [--thread]
+ [--attach[=] | --inline[=]]
+ [-s | --signoff] [] [--start-number ]
+ [--in-reply-to=Message-Id] [--suffix=.]
+ [--ignore-if-in-upstream]
+ [--subject-prefix=Subject-Prefix]
+ [..]
DESCRIPTION
-----------
@@ -46,6 +48,8 @@ reference.
OPTIONS
-------
+include::diff-options.txt[]
+
-o|--output-directory ::
Use to store the resulting files, instead of the
current working directory.
@@ -68,8 +72,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
@@ -88,6 +99,12 @@ OPTIONS
patches being generated, and any patch that matches is
ignored.
+--subject-prefix=::
+ Instead of the standard '[PATCH]' prefix in the subject
+ line, instead use '[]'. This
+ allows for useful naming of a patch series, and can be
+ combined with the --numbered option.
+
--suffix=.::
Instead of using `.patch` as the suffix for generated
filenames, use specifed suffix. A common alternative is