summaryrefslogtreecommitdiffstats
path: root/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-03-12 07:29:20 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-03-12 07:29:20 +0000
commitc51fede9f2fdd66e06416d7865b023924b52e659 (patch)
tree19a562e90847738d119806fae209a948d74e0107 /git-format-patch.txt
parentd15328acbacd5d5b1b56a7ee143ccf7db9e7549e (diff)
downloadgit-htmldocs-c51fede9f2fdd66e06416d7865b023924b52e659.tar.gz
Autogenerated HTML docs for v1.5.0.3-382-g34572
Diffstat (limited to 'git-format-patch.txt')
-rw-r--r--git-format-patch.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/git-format-patch.txt b/git-format-patch.txt
index 84eabebe0..111d7c60b 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -9,8 +9,9 @@ git-format-patch - Prepare patches for e-mail submission
SYNOPSIS
--------
[verse]
-'git-format-patch' [<common diff options>] [-n | -k] [-o <dir> | --stdout]
- [--attach] [--thread] [-s | --signoff] [--start-number <n>]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--thread]
+ [--attach[=<boundary>] | --inline[=<boundary>]]
+ [-s | --signoff] [<common diff options>] [--start-number <n>]
[--in-reply-to=Message-Id] [--suffix=.<sfx>]
[--ignore-if-in-upstream]
<since>[..<until>]
@@ -70,8 +71,15 @@ include::diff-options.txt[]
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[=<boundary>]::
+ 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[=<boundary>]::
+ 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