diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-25 19:54:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-25 19:54:57 (GMT) |
| commit | e79992abdb42f8c9e517c60d7e023894a83764a1 (patch) | |
| tree | 0625a95b8c3f20a85d9a07a1696f5803054e620e /Documentation | |
| parent | a8861ea81be90594d9f23d30792d6cf8d22ad1ff (diff) | |
| parent | 76af073457320ffcba937a8c7ed4e8b37150cca8 (diff) | |
| download | git-e79992abdb42f8c9e517c60d7e023894a83764a1.zip git-e79992abdb42f8c9e517c60d7e023894a83764a1.tar.gz git-e79992abdb42f8c9e517c60d7e023894a83764a1.tar.bz2 | |
Merge branch 'jt/format-patch'
* jt/format-patch:
builtin-log: typefix for recent format-patch changes.
Add option to set initial In-Reply-To/References
Add option to enable threading headers
git-format-patch: Make the second and subsequent mails replies to the first
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-format-patch.txt | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 4ca0014..67425dc 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 <dir> | --stdout] [--attach] +'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread] [-s | --signoff] [--diff-options] [--start-number <n>] + [--in-reply-to=Message-Id] <since>[..<until>] DESCRIPTION @@ -35,6 +36,10 @@ they are created in the current working directory. If -n is specified, instead of "[PATCH] Subject", the first line is formatted as "[PATCH n/m] Subject". +If given --thread, git-format-patch will generate In-Reply-To and +References headers to make the second and subsequent patch mails appear +as replies to the first mail; this also generates a Message-Id header to +reference. OPTIONS ------- @@ -63,6 +68,15 @@ OPTIONS --attach:: Create attachments instead of inlining patches. +--thread:: + Add In-Reply-To and References headers to make the second and + subsequent mails appear as replies to the first. Also generates + the Message-Id header to reference. + +--in-reply-to=Message-Id:: + Make the first mail (or all the mails with --no-thread) appear as a + reply to the given Message-Id, which avoids breaking threads to + provide a new patch series. CONFIGURATION ------------- |