summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-10 23:38:18 -0800
committerJunio C Hamano <junkio@cox.net>2007-03-10 23:38:18 -0800
commit8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288 (patch)
treeb5c2cd69063409beb852841792fbf0ed41d12278 /Documentation/git-format-patch.txt
parentcf6981d4932007555689052cbc255b911674b01c (diff)
parent33ee4cfb6929c77307887bc2124eaeaf011892dc (diff)
downloadgit-8a3fbdd9e6c37c74b12fd0e8bd7cde8372861288.tar.gz
Merge branch 'js/attach'
* js/attach: format-patch --attach: not folding some long headers. format-patch: add --inline option and make --attach a true attachment
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt16
1 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 84eabebe0b..111d7c60bf 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' [<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