format-patch: --numbered-files and --stdout aren't mutually exclusive
[git/git.git] / Documentation / git-format-patch.txt
CommitLineData
215a7ad1
JH
1git-format-patch(1)
2===================
7fc9d69f
JH
3
4NAME
5----
7bd7f280 6git-format-patch - Prepare patches for e-mail submission
7fc9d69f
JH
7
8
9SYNOPSIS
10--------
353ce815 11[verse]
b1889c36 12'git format-patch' [-k] [-o <dir> | --stdout] [--thread]
a5a27c79
DB
13 [--attach[=<boundary>] | --inline[=<boundary>]]
14 [-s | --signoff] [<common diff options>]
15 [-n | --numbered | -N | --no-numbered]
16 [--start-number <n>] [--numbered-files]
17 [--in-reply-to=Message-Id] [--suffix=.<sfx>]
18 [--ignore-if-in-upstream]
19 [--subject-prefix=Subject-Prefix]
736cc67d 20 [--cc=<email>]
a5a27c79 21 [--cover-letter]
8a1d076e 22 [ <since> | <revision range> ]
7fc9d69f
JH
23
24DESCRIPTION
25-----------
2052d146 26
8a1d076e 27Prepare each commit with its patch in
2052d146 28one file per commit, formatted to resemble UNIX mailbox format.
2052d146 29The output of this command is convenient for e-mail submission or
ba020ef5 30for use with 'git-am'.
35ef3a4c 31
8a1d076e
JH
32There are two ways to specify which commits to operate on.
33
341. A single commit, <since>, specifies that the commits leading
35 to the tip of the current branch that are not in the history
36 that leads to the <since> to be output.
37
382. Generic <revision range> expression (see "SPECIFYING
5162e697 39 REVISIONS" section in linkgit:git-rev-parse[1]) means the
2f6a3823
JH
40 commits in the specified range.
41
42A single commit, when interpreted as a <revision range>
43expression, means "everything that leads to that commit", but
44if you write 'git format-patch <commit>', the previous rule
45applies to that command line and you do not get "everything
46since the beginning of the time". If you want to format
47everything since project inception to one commit, say "git
48format-patch \--root <commit>" to make it clear that it is the
16088d88
JH
49latter case. If you want to format a single commit, you can do
50this with "git format-patch -1 <commit>".
8a1d076e 51
e6ff0f42 52By default, each output file is numbered sequentially from 1, and uses the
2052d146 53first line of the commit message (massaged for pathname safety) as
e6ff0f42
JL
54the filename. With the --numbered-files option, the output file names
55will only be numbers, without the first line of the commit appended.
56The names of the output files are printed to standard
2052d146 57output, unless the --stdout option is specified.
66f04f38 58
2052d146
DS
59If -o is specified, output files are created in <dir>. Otherwise
60they are created in the current working directory.
35ef3a4c 61
a567fdcb
BG
62By default, the subject of a single patch is "[PATCH] First Line" and
63the subject when multiple patches are output is "[PATCH n/m] First
64Line". To force 1/1 to be added for a single patch, use -n. To omit
65patch numbers from the subject, use -N
35ef3a4c 66
ba020ef5 67If given --thread, 'git-format-patch' will generate In-Reply-To and
cc35de84
JT
68References headers to make the second and subsequent patch mails appear
69as replies to the first mail; this also generates a Message-Id header to
70reference.
7fc9d69f
JH
71
72OPTIONS
73-------
c1a95fa6 74:git-format-patch: 1
b8105375
BG
75include::diff-options.txt[]
76
ed5f07a6
MV
77-<n>::
78 Limits the number of patches to prepare.
79
3240240f
SB
80-o <dir>::
81--output-directory <dir>::
35ef3a4c 82 Use <dir> to store the resulting files, instead of the
efd02016 83 current working directory.
35ef3a4c 84
3240240f
SB
85-n::
86--numbered::
a567fdcb 87 Name output in '[PATCH n/m]' format, even with a single patch.
35ef3a4c 88
3240240f
SB
89-N::
90--no-numbered::
49604a4d
BG
91 Name output in '[PATCH]' format.
92
2052d146
DS
93--start-number <n>::
94 Start numbering the patches at <n> instead of 1.
95
e6ff0f42
JL
96--numbered-files::
97 Output file names will be a simple number sequence
98 without the default first line of the commit appended.
e6ff0f42 99
3240240f
SB
100-k::
101--keep-subject::
35ef3a4c
JH
102 Do not strip/add '[PATCH]' from the first line of the
103 commit log message.
104
3240240f
SB
105-s::
106--signoff::
6f855371
NW
107 Add `Signed-off-by:` line to the commit message, using
108 the committer identity of yourself.
109
54ba6013 110--stdout::
2052d146
DS
111 Print all commits to the standard output in mbox format,
112 instead of creating a file for each one.
7fc9d69f 113
c112f689
JS
114--attach[=<boundary>]::
115 Create multipart/mixed attachment, the first part of
116 which is the commit message and the patch itself in the
117 second part, with "Content-Disposition: attachment".
118
119--inline[=<boundary>]::
120 Create multipart/mixed attachment, the first part of
121 which is the commit message and the patch itself in the
122 second part, with "Content-Disposition: inline".
a15a44ef 123
cc35de84
JT
124--thread::
125 Add In-Reply-To and References headers to make the second and
126 subsequent mails appear as replies to the first. Also generates
127 the Message-Id header to reference.
28ffb898 128
da56645d
JT
129--in-reply-to=Message-Id::
130 Make the first mail (or all the mails with --no-thread) appear as a
131 reply to the given Message-Id, which avoids breaking threads to
132 provide a new patch series.
133
cc75ad67
DK
134--ignore-if-in-upstream::
135 Do not include a patch that matches a commit in
136 <until>..<since>. This will examine all patches reachable
137 from <since> but not from <until> and compare them with the
138 patches being generated, and any patch that matches is
139 ignored.
140
2d9e4a47
RJ
141--subject-prefix=<Subject-Prefix>::
142 Instead of the standard '[PATCH]' prefix in the subject
143 line, instead use '[<Subject-Prefix>]'. This
144 allows for useful naming of a patch series, and can be
145 combined with the --numbered option.
146
736cc67d
DB
147--cc=<email>::
148 Add a "Cc:" header to the email headers. This is in addition
149 to any configured headers, and may be used multiple times.
150
a5a27c79 151--cover-letter::
f4912391
MM
152 In addition to the patches, generate a cover letter file
153 containing the shortlog and the overall diffstat. You can
154 fill in a description in the file before sending it out.
a5a27c79 155
03eeaeae 156--suffix=.<sfx>::
917a8f89 157 Instead of using `.patch` as the suffix for generated
02783075 158 filenames, use specified suffix. A common alternative is
917a8f89 159 `--suffix=.txt`.
03eeaeae
JH
160+
161Note that you would need to include the leading dot `.` if you
162want a filename like `0001-description-of-my-change.patch`, and
163the first letter does not have to be a dot. Leaving it empty would
164not add any suffix.
165
37c22a4b
CMOF
166--no-binary::
167 Don't output contents of changes in binary files, just take note
168 that they differ. Note that this disable the patch to be properly
169 applied. By default the contents of changes in those files are
170 encoded in the patch.
171
96ce6d26
MM
172CONFIGURATION
173-------------
49604a4d
BG
174You can specify extra mail header lines to be added to each message
175in the repository configuration, new defaults for the subject prefix
176and file suffix, and number patches when outputting more than one.
96ce6d26 177
917a8f89 178------------
96ce6d26 179[format]
7f9d77f2
JN
180 headers = "Organization: git-foo\n"
181 subjectprefix = CHANGE
182 suffix = .txt
183 numbered = auto
fe8928e6 184 cc = <email>
917a8f89 185------------
03eeaeae 186
96ce6d26 187
28ffb898
JH
188EXAMPLES
189--------
190
921177f5 191* Extract commits between revisions R1 and R2, and apply them on top of
ba020ef5 192the current branch using 'git-am' to cherry-pick them:
921177f5
CC
193+
194------------
467c0197 195$ git format-patch -k --stdout R1..R2 | git am -3 -k
921177f5
CC
196------------
197
198* Extract all commits which are in the current branch but not in the
199origin branch:
200+
201------------
202$ git format-patch origin
203------------
204+
205For each commit a separate file is created in the current directory.
206
207* Extract all commits that lead to 'origin' since the inception of the
208project:
209+
210------------
9c67c757 211$ git format-patch --root origin
921177f5
CC
212------------
213
214* The same as the previous one:
215+
216------------
217$ git format-patch -M -B origin
218------------
219+
220Additionally, it detects and handles renames and complete rewrites
221intelligently to produce a renaming patch. A renaming patch reduces
222the amount of text output, and generally makes it easier to review it.
223Note that the "patch" program does not understand renaming patches, so
224use it only when you know the recipient uses git to apply your patch.
225
226* Extract three topmost commits from the current branch and format them
227as e-mailable patches:
228+
229------------
230$ git format-patch -3
231------------
28ffb898 232
56ae8df5 233SEE ALSO
28ffb898 234--------
5162e697 235linkgit:git-am[1], linkgit:git-send-email[1]
28ffb898
JH
236
237
7fc9d69f
JH
238Author
239------
59eb68aa 240Written by Junio C Hamano <gitster@pobox.com>
7fc9d69f
JH
241
242Documentation
243--------------
244Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
245
246GIT
247---
9e1f0a85 248Part of the linkgit:git[1] suite