format-patch: add --range-diff option to embed diff in cover letter
[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]
50710ce4 12'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]
f693b7e9 13 [--no-thread | --thread[=<style>]]
50710ce4
SB
14 [(--attach|--inline)[=<boundary>] | --no-attach]
15 [-s | --signoff]
6622d9c7 16 [--signature=<signature> | --no-signature]
7022650f 17 [--signature-file=<file>]
a5a27c79
DB
18 [-n | --numbered | -N | --no-numbered]
19 [--start-number <n>] [--numbered-files]
20 [--in-reply-to=Message-Id] [--suffix=.<sfx>]
21 [--ignore-if-in-upstream]
68e83a5b
JT
22 [--rfc] [--subject-prefix=Subject-Prefix]
23 [(--reroll-count|-v) <n>]
ae6c098f 24 [--to=<email>] [--cc=<email>]
2a4c2607 25 [--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
126facf8 26 [--interdiff=<previous>]
31e2617a 27 [--range-diff=<previous>]
738e88a2 28 [--progress]
50710ce4 29 [<common diff options>]
8a1d076e 30 [ <since> | <revision range> ]
7fc9d69f
JH
31
32DESCRIPTION
33-----------
2052d146 34
8a1d076e 35Prepare each commit with its patch in
2052d146 36one file per commit, formatted to resemble UNIX mailbox format.
2052d146 37The output of this command is convenient for e-mail submission or
0b444cdb 38for use with 'git am'.
35ef3a4c 39
8a1d076e
JH
40There are two ways to specify which commits to operate on.
41
421. A single commit, <since>, specifies that the commits leading
43 to the tip of the current branch that are not in the history
44 that leads to the <since> to be output.
45
462. Generic <revision range> expression (see "SPECIFYING
9d83e382 47 REVISIONS" section in linkgit:gitrevisions[7]) means the
2f6a3823
JH
48 commits in the specified range.
49
2d266f9d
TR
50The first rule takes precedence in the case of a single <commit>. To
51apply the second rule, i.e., format everything since the beginning of
9e9f132f 52history up until <commit>, use the `--root` option: `git format-patch
6cf378f0 53--root <commit>`. If you want to format only <commit> itself, you
dce5ef14 54can do this with `git format-patch -1 <commit>`.
8a1d076e 55
e6ff0f42 56By default, each output file is numbered sequentially from 1, and uses the
2052d146 57first line of the commit message (massaged for pathname safety) as
dce5ef14 58the filename. With the `--numbered-files` option, the output file names
e6ff0f42
JL
59will only be numbers, without the first line of the commit appended.
60The names of the output files are printed to standard
dce5ef14 61output, unless the `--stdout` option is specified.
66f04f38 62
dce5ef14 63If `-o` is specified, output files are created in <dir>. Otherwise
bc6bf2d7 64they are created in the current working directory. The default path
ae9f6311 65can be set with the `format.outputDirectory` configuration option.
bc6bf2d7
AK
66The `-o` option takes precedence over `format.outputDirectory`.
67To store patches in the current working directory even when
68`format.outputDirectory` points elsewhere, use `-o .`.
35ef3a4c 69
52ffe995
JW
70By default, the subject of a single patch is "[PATCH] " followed by
71the concatenation of lines from the commit message up to the first blank
72line (see the DISCUSSION section of linkgit:git-commit[1]).
73
74When multiple patches are output, the subject prefix will instead be
75"[PATCH n/m] ". To force 1/1 to be added for a single patch, use `-n`.
76To omit patch numbers from the subject, use `-N`.
35ef3a4c 77
dce5ef14
BG
78If given `--thread`, `git-format-patch` will generate `In-Reply-To` and
79`References` headers to make the second and subsequent patch mails appear
80as replies to the first mail; this also generates a `Message-Id` header to
cc35de84 81reference.
7fc9d69f
JH
82
83OPTIONS
84-------
c1a95fa6 85:git-format-patch: 1
b8105375
BG
86include::diff-options.txt[]
87
ed5f07a6 88-<n>::
2c642ed8 89 Prepare patches from the topmost <n> commits.
ed5f07a6 90
3240240f
SB
91-o <dir>::
92--output-directory <dir>::
35ef3a4c 93 Use <dir> to store the resulting files, instead of the
efd02016 94 current working directory.
35ef3a4c 95
3240240f
SB
96-n::
97--numbered::
a567fdcb 98 Name output in '[PATCH n/m]' format, even with a single patch.
35ef3a4c 99
3240240f
SB
100-N::
101--no-numbered::
49604a4d
BG
102 Name output in '[PATCH]' format.
103
2052d146
DS
104--start-number <n>::
105 Start numbering the patches at <n> instead of 1.
106
e6ff0f42
JL
107--numbered-files::
108 Output file names will be a simple number sequence
109 without the default first line of the commit appended.
e6ff0f42 110
3240240f
SB
111-k::
112--keep-subject::
35ef3a4c
JH
113 Do not strip/add '[PATCH]' from the first line of the
114 commit log message.
115
3240240f
SB
116-s::
117--signoff::
6f855371
NW
118 Add `Signed-off-by:` line to the commit message, using
119 the committer identity of yourself.
b2c150d3 120 See the signoff option in linkgit:git-commit[1] for more information.
6f855371 121
54ba6013 122--stdout::
2052d146
DS
123 Print all commits to the standard output in mbox format,
124 instead of creating a file for each one.
7fc9d69f 125
c112f689
JS
126--attach[=<boundary>]::
127 Create multipart/mixed attachment, the first part of
128 which is the commit message and the patch itself in the
dce5ef14 129 second part, with `Content-Disposition: attachment`.
c112f689 130
0db5260b
JW
131--no-attach::
132 Disable the creation of an attachment, overriding the
133 configuration setting.
134
c112f689
JS
135--inline[=<boundary>]::
136 Create multipart/mixed attachment, the first part of
137 which is the commit message and the patch itself in the
dce5ef14 138 second part, with `Content-Disposition: inline`.
a15a44ef 139
30984ed2 140--thread[=<style>]::
f693b7e9 141--no-thread::
dce5ef14 142 Controls addition of `In-Reply-To` and `References` headers to
f693b7e9 143 make the second and subsequent mails appear as replies to the
dce5ef14 144 first. Also controls generation of the `Message-Id` header to
f693b7e9 145 reference.
30984ed2
TR
146+
147The optional <style> argument can be either `shallow` or `deep`.
fd1ff306 148'shallow' threading makes every mail a reply to the head of the
30984ed2 149series, where the head is chosen from the cover letter, the
6cf378f0 150`--in-reply-to`, and the first patch mail, in this order. 'deep'
f693b7e9
YD
151threading makes every mail a reply to the previous one.
152+
ae9f6311 153The default is `--no-thread`, unless the `format.thread` configuration
dce5ef14 154is set. If `--thread` is specified without a style, it defaults to the
ae9f6311 155style specified by `format.thread` if any, or else `shallow`.
f693b7e9
YD
156+
157Beware that the default for 'git send-email' is to thread emails
dce5ef14
BG
158itself. If you want `git format-patch` to take care of threading, you
159will want to ensure that threading is disabled for `git send-email`.
28ffb898 160
da56645d 161--in-reply-to=Message-Id::
dce5ef14 162 Make the first mail (or all the mails with `--no-thread`) appear as a
da56645d
JT
163 reply to the given Message-Id, which avoids breaking threads to
164 provide a new patch series.
165
cc75ad67
DK
166--ignore-if-in-upstream::
167 Do not include a patch that matches a commit in
168 <until>..<since>. This will examine all patches reachable
169 from <since> but not from <until> and compare them with the
170 patches being generated, and any patch that matches is
171 ignored.
172
2d9e4a47
RJ
173--subject-prefix=<Subject-Prefix>::
174 Instead of the standard '[PATCH]' prefix in the subject
175 line, instead use '[<Subject-Prefix>]'. This
176 allows for useful naming of a patch series, and can be
dce5ef14 177 combined with the `--numbered` option.
2d9e4a47 178
68e83a5b
JT
179--rfc::
180 Alias for `--subject-prefix="RFC PATCH"`. RFC means "Request For
181 Comments"; use this when sending an experimental patch for
182 discussion rather than application.
183
7952ea66 184-v <n>::
4aad08e0
JH
185--reroll-count=<n>::
186 Mark the series as the <n>-th iteration of the topic. The
d614f075 187 output filenames have `v<n>` prepended to them, and the
4aad08e0
JH
188 subject prefix ("PATCH" by default, but configurable via the
189 `--subject-prefix` option) has ` v<n>` appended to it. E.g.
190 `--reroll-count=4` may produce `v4-0001-add-makefile.patch`
191 file that has "Subject: [PATCH v4 1/20] Add makefile" in it.
192
ae6c098f
SD
193--to=<email>::
194 Add a `To:` header to the email headers. This is in addition
195 to any configured headers, and may be used multiple times.
b2cd17b9
TR
196 The negated form `--no-to` discards all `To:` headers added so
197 far (from config or command line).
ae6c098f 198
736cc67d 199--cc=<email>::
dce5ef14 200 Add a `Cc:` header to the email headers. This is in addition
736cc67d 201 to any configured headers, and may be used multiple times.
b2cd17b9
TR
202 The negated form `--no-cc` discards all `Cc:` headers added so
203 far (from config or command line).
736cc67d 204
a9080475
JK
205--from::
206--from=<ident>::
207 Use `ident` in the `From:` header of each commit email. If the
208 author ident of the commit is not textually identical to the
209 provided `ident`, place a `From:` header in the body of the
210 message with the original author. If no `ident` is given, use
211 the committer ident.
212+
213Note that this option is only useful if you are actually sending the
214emails and want to identify yourself as the sender, but retain the
215original author (and `git am` will correctly pick up the in-body
216header). Note also that `git send-email` already handles this
217transformation for you, and this option should not be used if you are
218feeding the result to `git send-email`.
219
d7d9c2d0
MH
220--add-header=<header>::
221 Add an arbitrary header to the email headers. This is in addition
222 to any configured headers, and may be used multiple times.
b2cd17b9
TR
223 For example, `--add-header="Organization: git-foo"`.
224 The negated form `--no-add-header` discards *all* (`To:`,
225 `Cc:`, and custom) headers added so far from config or command
226 line.
d7d9c2d0 227
2a4c2607 228--[no-]cover-letter::
f4912391 229 In addition to the patches, generate a cover letter file
561d2b79 230 containing the branch description, shortlog and the overall diffstat. You can
f4912391 231 fill in a description in the file before sending it out.
a5a27c79 232
126facf8 233--interdiff=<previous>::
ee6cbf71
ES
234 As a reviewer aid, insert an interdiff into the cover letter,
235 or as commentary of the lone patch of a 1-patch series, showing
126facf8
ES
236 the differences between the previous version of the patch series and
237 the series currently being formatted. `previous` is a single revision
238 naming the tip of the previous series which shares a common base with
239 the series being formatted (for example `git format-patch
240 --cover-letter --interdiff=feature/v1 -3 feature/v2`).
241
31e2617a
ES
242--range-diff=<previous>::
243 As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1])
244 into the cover letter showing the differences between the previous
245 version of the patch series and the series currently being formatted.
246 `previous` is a single revision naming the tip of the previous
247 series which shares a common base with the series being formatted (for
248 example `git format-patch --cover-letter --range-diff=feature/v1 -3
249 feature/v2`).
250
e422c0cf
JH
251--notes[=<ref>]::
252 Append the notes (see linkgit:git-notes[1]) for the commit
253 after the three-dash line.
254+
255The expected use case of this is to write supporting explanation for
6454d9f1
PO
256the commit that does not belong to the commit log message proper,
257and include it with the patch submission. While one can simply write
258these explanations after `format-patch` has run but before sending,
2de9b711 259keeping them as Git notes allows them to be maintained between versions
6454d9f1
PO
260of the patch series (but see the discussion of the `notes.rewrite`
261configuration options in linkgit:git-notes[1] to use this workflow).
e422c0cf 262
2c7ee986 263--[no-]signature=<signature>::
6622d9c7
SB
264 Add a signature to each message produced. Per RFC 3676 the signature
265 is separated from the body by a line with '-- ' on it. If the
2de9b711 266 signature option is omitted the signature defaults to the Git version
6622d9c7
SB
267 number.
268
7022650f
JM
269--signature-file=<file>::
270 Works just like --signature except the signature is read from a file.
271
03eeaeae 272--suffix=.<sfx>::
917a8f89 273 Instead of using `.patch` as the suffix for generated
02783075 274 filenames, use specified suffix. A common alternative is
50710ce4
SB
275 `--suffix=.txt`. Leaving this empty will remove the `.patch`
276 suffix.
03eeaeae 277+
50710ce4
SB
278Note that the leading character does not have to be a dot; for example,
279you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
03eeaeae 280
b7df098c 281-q::
b781cfaf
CMN
282--quiet::
283 Do not print the names of the generated files to standard output.
284
37c22a4b 285--no-binary::
50710ce4
SB
286 Do not output contents of changes in binary files, instead
287 display a notice that those files changed. Patches generated
288 using this option cannot be applied properly, but they are
289 still useful for code review.
37c22a4b 290
3a30aa17 291--zero-commit::
292 Output an all-zero hash in each patch's From header instead
293 of the hash of the commit.
294
fa2ab86d
XY
295--base=<commit>::
296 Record the base tree information to identify the state the
297 patch series applies to. See the BASE TREE INFORMATION section
298 below for details.
299
2d266f9d
TR
300--root::
301 Treat the revision argument as a <revision range>, even if it
302 is just a single commit (that would normally be treated as a
303 <since>). Note that root commits included in the specified
304 range are always formatted as creation patches, independently
305 of this flag.
306
738e88a2
KW
307--progress::
308 Show progress reports on stderr as patches are generated.
309
96ce6d26
MM
310CONFIGURATION
311-------------
50710ce4
SB
312You can specify extra mail header lines to be added to each message,
313defaults for the subject prefix and file suffix, number patches when
ae6c098f
SD
314outputting more than one patch, add "To" or "Cc:" headers, configure
315attachments, and sign off patches with configuration variables.
96ce6d26 316
917a8f89 317------------
96ce6d26 318[format]
7f9d77f2 319 headers = "Organization: git-foo\n"
da0005b8 320 subjectPrefix = CHANGE
7f9d77f2
JN
321 suffix = .txt
322 numbered = auto
ae6c098f 323 to = <email>
fe8928e6 324 cc = <email>
0db5260b 325 attach [ = mime-boundary-string ]
da0005b8 326 signOff = true
2a4c2607 327 coverletter = auto
917a8f89 328------------
03eeaeae 329
96ce6d26 330
e0d48279
JN
331DISCUSSION
332----------
333
334The patch produced by 'git format-patch' is in UNIX mailbox format,
335with a fixed "magic" time stamp to indicate that the file is output
336from format-patch rather than a real mailbox, like so:
337
338------------
339From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001
340From: Tony Luck <tony.luck@intel.com>
341Date: Tue, 13 Jul 2010 11:42:54 -0700
342Subject: [PATCH] =?UTF-8?q?[IA64]=20Put=20ia64=20config=20files=20on=20the=20?=
343 =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20diet?=
344MIME-Version: 1.0
345Content-Type: text/plain; charset=UTF-8
346Content-Transfer-Encoding: 8bit
347
348arch/arm config files were slimmed down using a python script
349(See commit c2330e286f68f1c408b4aa6515ba49d57f05beae comment)
350
351Do the same for ia64 so we can have sleek & trim looking
352...
353------------
354
355Typically it will be placed in a MUA's drafts folder, edited to add
356timely commentary that should not go in the changelog after the three
357dashes, and then sent as a message whose body, in our example, starts
358with "arch/arm config files were...". On the receiving end, readers
359can save interesting patches in a UNIX mailbox and apply them with
360linkgit:git-am[1].
361
362When a patch is part of an ongoing discussion, the patch generated by
363'git format-patch' can be tweaked to take advantage of the 'git am
364--scissors' feature. After your response to the discussion comes a
365line that consists solely of "`-- >8 --`" (scissors and perforation),
366followed by the patch with unnecessary header fields removed:
367
368------------
369...
370> So we should do such-and-such.
371
372Makes sense to me. How about this patch?
373
374-- >8 --
375Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet
376
377arch/arm config files were slimmed down using a python script
378...
379------------
380
381When sending a patch this way, most often you are sending your own
382patch, so in addition to the "`From $SHA1 $magic_timestamp`" marker you
383should omit `From:` and `Date:` lines from the patch file. The patch
384title is likely to be different from the subject of the discussion the
385patch is in response to, so it is likely that you would want to keep
386the Subject: line, like the example above.
387
57756161
JN
388Checking for patch corruption
389~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
390Many mailers if not set up properly will corrupt whitespace. Here are
391two common types of corruption:
392
393* Empty context lines that do not have _any_ whitespace.
394
395* Non-empty context lines that have one extra whitespace at the
396 beginning.
397
398One way to test if your MUA is set up correctly is:
399
400* Send the patch to yourself, exactly the way you would, except
401 with To: and Cc: lines that do not contain the list and
402 maintainer address.
403
404* Save that patch to a file in UNIX mailbox format. Call it a.patch,
405 say.
406
407* Apply it:
408
409 $ git fetch <project> master:test-apply
410 $ git checkout test-apply
411 $ git reset --hard
412 $ git am a.patch
413
414If it does not apply correctly, there can be various reasons.
415
416* The patch itself does not apply cleanly. That is _bad_ but
417 does not have much to do with your MUA. You might want to rebase
418 the patch with linkgit:git-rebase[1] before regenerating it in
419 this case.
420
421* The MUA corrupted your patch; "am" would complain that
422 the patch does not apply. Look in the .git/rebase-apply/ subdirectory and
423 see what 'patch' file contains and check for the common
424 corruption patterns mentioned above.
425
426* While at it, check the 'info' and 'final-commit' files as well.
427 If what is in 'final-commit' is not exactly what you would want to
428 see in the commit log message, it is very likely that the
429 receiver would end up hand editing the log message when applying
430 your patch. Things like "Hi, this is my first patch.\n" in the
431 patch e-mail should come after the three-dash line that signals
432 the end of the commit message.
433
dc53151f
JN
434MUA-SPECIFIC HINTS
435------------------
436Here are some hints on how to successfully submit patches inline using
437various mailers.
438
36c10e6d
JN
439GMail
440~~~~~
441GMail does not have any way to turn off line wrapping in the web
442interface, so it will mangle any emails that you send. You can however
443use "git send-email" and send your patches through the GMail SMTP server, or
444use any IMAP email client to connect to the google IMAP server and forward
445the emails through that.
446
447For hints on using 'git send-email' to send your patches through the
448GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1].
449
450For hints on submission using the IMAP interface, see the EXAMPLE
451section of linkgit:git-imap-send[1].
452
dc53151f
JN
453Thunderbird
454~~~~~~~~~~~
455By default, Thunderbird will both wrap emails as well as flag
456them as being 'format=flowed', both of which will make the
2de9b711 457resulting email unusable by Git.
dc53151f 458
b8959605
JS
459There are three different approaches: use an add-on to turn off line wraps,
460configure Thunderbird to not mangle patches, or use
dc53151f
JN
461an external editor to keep Thunderbird from mangling the patches.
462
b8959605
JS
463Approach #1 (add-on)
464^^^^^^^^^^^^^^^^^^^^
465
466Install the Toggle Word Wrap add-on that is available from
467https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/
468It adds a menu entry "Enable Word Wrap" in the composer's "Options" menu
469that you can tick off. Now you can compose the message as you otherwise do
470(cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to
471insert line breaks manually in any text that you type.
472
473Approach #2 (configuration)
dc53151f
JN
474^^^^^^^^^^^^^^^^^^^^^^^^^^^
475Three steps:
476
4771. Configure your mail server composition as plain text:
478 Edit...Account Settings...Composition & Addressing,
479 uncheck "Compose Messages in HTML".
480
4812. Configure your general composition window to not wrap.
482+
483In Thunderbird 2:
484Edit..Preferences..Composition, wrap plain text messages at 0
485+
486In Thunderbird 3:
487Edit..Preferences..Advanced..Config Editor. Search for
488"mail.wrap_long_lines".
f737684d
RJ
489Toggle it to make sure it is set to `false`. Also, search for
490"mailnews.wraplength" and set the value to 0.
dc53151f
JN
491
4923. Disable the use of format=flowed:
493Edit..Preferences..Advanced..Config Editor. Search for
494"mailnews.send_plaintext_flowed".
495Toggle it to make sure it is set to `false`.
496
497After that is done, you should be able to compose email as you
498otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc),
499and the patches will not be mangled.
500
b8959605 501Approach #3 (external editor)
dc53151f
JN
502^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
503
504The following Thunderbird extensions are needed:
505AboutConfig from http://aboutconfig.mozdev.org/ and
506External Editor from http://globs.org/articles.php?lng=en&pg=8
507
5081. Prepare the patch as a text file using your method of choice.
509
5102. Before opening a compose window, use Edit->Account Settings to
511 uncheck the "Compose messages in HTML format" setting in the
512 "Composition & Addressing" panel of the account to be used to
513 send the patch.
514
5153. In the main Thunderbird window, 'before' you open the compose
516 window for the patch, use Tools->about:config to set the
517 following to the indicated values:
518+
519----------
520 mailnews.send_plaintext_flowed => false
521 mailnews.wraplength => 0
522----------
523
5244. Open a compose window and click the external editor icon.
525
5265. In the external editor window, read in the patch file and exit
527 the editor normally.
528
529Side note: it may be possible to do step 2 with
530about:config and the following settings but no one's tried yet.
531
532----------
533 mail.html_compose => false
534 mail.identity.default.compose_html => false
535 mail.identity.id?.compose_html => false
536----------
537
538There is a script in contrib/thunderbird-patch-inline which can help
539you include patches with Thunderbird in an easy way. To use it, do the
540steps above and then use the script as the external editor.
541
967ab8ef
JN
542KMail
543~~~~~
544This should help you to submit patches inline using KMail.
545
5461. Prepare the patch as a text file.
547
5482. Click on New Mail.
549
5503. Go under "Options" in the Composer window and be sure that
551 "Word wrap" is not set.
552
5534. Use Message -> Insert file... and insert the patch.
554
5555. Back in the compose window: add whatever other text you wish to the
556 message, complete the addressing and subject fields, and press send.
557
fa2ab86d
XY
558BASE TREE INFORMATION
559---------------------
560
561The base tree information block is used for maintainers or third party
562testers to know the exact state the patch series applies to. It consists
563of the 'base commit', which is a well-known commit that is part of the
564stable part of the project history everybody else works off of, and zero
565or more 'prerequisite patches', which are well-known patches in flight
566that is not yet part of the 'base commit' that need to be applied on top
567of 'base commit' in topological order before the patches can be applied.
568
569The 'base commit' is shown as "base-commit: " followed by the 40-hex of
570the commit object name. A 'prerequisite patch' is shown as
571"prerequisite-patch-id: " followed by the 40-hex 'patch id', which can
572be obtained by passing the patch through the `git patch-id --stable`
573command.
574
575Imagine that on top of the public commit P, you applied well-known
576patches X, Y and Z from somebody else, and then built your three-patch
577series A, B, C, the history would be like:
578
579................................................
580---P---X---Y---Z---A---B---C
581................................................
582
583With `git format-patch --base=P -3 C` (or variants thereof, e.g. with
7ba1ceef 584`--cover-letter` or using `Z..C` instead of `-3 C` to specify the
fa2ab86d
XY
585range), the base tree information block is shown at the end of the
586first message the command outputs (either the first patch, or the
587cover letter), like this:
588
589------------
590base-commit: P
591prerequisite-patch-id: X
592prerequisite-patch-id: Y
593prerequisite-patch-id: Z
594------------
595
596For non-linear topology, such as
597
598................................................
599---P---X---A---M---C
600 \ /
601 Y---Z---B
602................................................
603
604You can also use `git format-patch --base=P -3 C` to generate patches
605for A, B and C, and the identifiers for P, X, Y, Z are appended at the
606end of the first message.
e0d48279 607
3de66517
XY
608If set `--base=auto` in cmdline, it will track base commit automatically,
609the base commit will be the merge base of tip commit of the remote-tracking
610branch and revision-range specified in cmdline.
611For a local branch, you need to track a remote branch by `git branch
612--set-upstream-to` before using this option.
613
28ffb898
JH
614EXAMPLES
615--------
616
921177f5 617* Extract commits between revisions R1 and R2, and apply them on top of
0b444cdb 618the current branch using 'git am' to cherry-pick them:
921177f5
CC
619+
620------------
467c0197 621$ git format-patch -k --stdout R1..R2 | git am -3 -k
921177f5
CC
622------------
623
624* Extract all commits which are in the current branch but not in the
625origin branch:
626+
627------------
628$ git format-patch origin
629------------
630+
631For each commit a separate file is created in the current directory.
632
633* Extract all commits that lead to 'origin' since the inception of the
634project:
635+
636------------
9c67c757 637$ git format-patch --root origin
921177f5
CC
638------------
639
640* The same as the previous one:
641+
642------------
643$ git format-patch -M -B origin
644------------
645+
646Additionally, it detects and handles renames and complete rewrites
647intelligently to produce a renaming patch. A renaming patch reduces
50710ce4 648the amount of text output, and generally makes it easier to review.
2de9b711
TA
649Note that non-Git "patch" programs won't understand renaming patches, so
650use it only when you know the recipient uses Git to apply your patch.
921177f5
CC
651
652* Extract three topmost commits from the current branch and format them
653as e-mailable patches:
654+
655------------
656$ git format-patch -3
657------------
28ffb898 658
56ae8df5 659SEE ALSO
28ffb898 660--------
5162e697 661linkgit:git-am[1], linkgit:git-send-email[1]
28ffb898 662
7fc9d69f
JH
663GIT
664---
9e1f0a85 665Part of the linkgit:git[1] suite