Google Git
Sign in
chromium / external / gitster / git-htmldocs / 3b4609d029e2db42b5154f019facecee49196bf0 / . / git-format-patch.html
blob: 2a6a21d5ac8476cf6282a8f73c6c2eb65cd481cb [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]306</style>
307<title>git-format-patch(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-format-patch(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-format-patch -
Junio C Hamano01078922006-03-10 00:31:47[diff] [blame]317 Prepare patches for e-mail submission
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamano235a91e2006-01-07 01:13:58[diff] [blame]323<div class="verseblock">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]324<div class="content"><em>git format-patch</em> [-k] [(-o|--output-directory) &lt;dir&gt; | --stdout]
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]325 [--no-thread | --thread[=&lt;style&gt;]]
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]326 [(--attach|--inline)[=&lt;boundary&gt;] | --no-attach]
327 [-s | --signoff]
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]328 [--signature=&lt;signature&gt; | --no-signature]
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]329 [-n | --numbered | -N | --no-numbered]
Junio C Hamano94cad1a2007-06-06 10:48:25[diff] [blame]330 [--start-number &lt;n&gt;] [--numbered-files]
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]331 [--in-reply-to=Message-Id] [--suffix=.&lt;sfx&gt;]
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]332 [--ignore-if-in-upstream]
Junio C Hamano6f1cca82007-04-12 05:02:47[diff] [blame]333 [--subject-prefix=Subject-Prefix]
Junio C Hamanoea90ab32010-03-15 20:32:55[diff] [blame]334 [--to=&lt;email&gt;] [--cc=&lt;email&gt;]
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]335 [--cover-letter]
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]336 [&lt;common diff options&gt;]
Junio C Hamano7d9e9bd2007-08-29 07:31:47[diff] [blame]337 [ &lt;since&gt; | &lt;revision range&gt; ]</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]338</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]339<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]340<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]341<div class="para"><p>Prepare each commit with its patch in
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]342one file per commit, formatted to resemble UNIX mailbox format.
Junio C Hamano7d9e9bd2007-08-29 07:31:47[diff] [blame]343The output of this command is convenient for e-mail submission or
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]344for use with <em>git am</em>.</p></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]345<div class="para"><p>There are two ways to specify which commits to operate on.</p></div>
346<div class="olist"><ol>
Junio C Hamano7d9e9bd2007-08-29 07:31:47[diff] [blame]347<li>
348<p>
349A single commit, &lt;since&gt;, specifies that the commits leading
350 to the tip of the current branch that are not in the history
351 that leads to the &lt;since&gt; to be output.
352</p>
353</li>
354<li>
355<p>
356Generic &lt;revision range&gt; expression (see "SPECIFYING
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]357 REVISIONS" section in <a href="gitrevisions.html">gitrevisions(1)</a>) means the
Junio C Hamano7d9e9bd2007-08-29 07:31:47[diff] [blame]358 commits in the specified range.
359</p>
360</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]361</ol></div>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]362<div class="para"><p>The first rule takes precedence in the case of a single &lt;commit&gt;. To
363apply the second rule, i.e., format everything since the beginning of
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]364history up until &lt;commit&gt;, use the <em>--root</em> option: <tt>git format-patch
365--root &lt;commit&gt;</tt>. If you want to format only &lt;commit&gt; itself, you
366can do this with <tt>git format-patch -1 &lt;commit&gt;</tt>.</p></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]367<div class="para"><p>By default, each output file is numbered sequentially from 1, and uses the
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]368first line of the commit message (massaged for pathname safety) as
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]369the filename. With the <tt>--numbered-files</tt> option, the output file names
Junio C Hamano94cad1a2007-06-06 10:48:25[diff] [blame]370will only be numbers, without the first line of the commit appended.
371The names of the output files are printed to standard
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]372output, unless the <tt>--stdout</tt> option is specified.</p></div>
373<div class="para"><p>If <tt>-o</tt> is specified, output files are created in &lt;dir&gt;. Otherwise
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]374they are created in the current working directory.</p></div>
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]375<div class="para"><p>By default, the subject of a single patch is "[PATCH] First Line" and
376the subject when multiple patches are output is "[PATCH n/m] First
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]377Line". To force 1/1 to be added for a single patch, use <tt>-n</tt>. To omit
378patch numbers from the subject, use <tt>-N</tt>.</p></div>
379<div class="para"><p>If given <tt>--thread</tt>, <tt>git-format-patch</tt> will generate <tt>In-Reply-To</tt> and
380<tt>References</tt> headers to make the second and subsequent patch mails appear
381as replies to the first mail; this also generates a <tt>Message-Id</tt> header to
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]382reference.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]383</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]384<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]385<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]386<div class="vlist"><dl>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]387<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]388-p
389</dt>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]390<dt>
391--no-stat
392</dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]393<dd>
394<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]395 Generate plain patches without any diffstats.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]396</p>
397</dd>
398<dt>
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]399-U&lt;n&gt;
400</dt>
Junio C Hamano69361562007-07-26 02:14:34[diff] [blame]401<dt>
402--unified=&lt;n&gt;
403</dt>
404<dd>
405<p>
406 Generate diffs with &lt;n&gt; lines of context instead of
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]407 the usual three.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]408</p>
409</dd>
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]410<dt>
411--patience
412</dt>
413<dd>
414<p>
415 Generate a diff using the "patience diff" algorithm.
416</p>
417</dd>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]418<dt>
419--stat[=width[,name-width]]
420</dt>
421<dd>
422<p>
423 Generate a diffstat. You can override the default
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]424 output width for 80-column terminal by <tt>--stat=width</tt>.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]425 The width of the filename part can be controlled by
426 giving another width to it separated by a comma.
427</p>
428</dd>
429<dt>
430--numstat
431</dt>
432<dd>
433<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]434 Similar to <tt>--stat</tt>, but shows number of added and
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]435 deleted lines in decimal notation and pathname without
436 abbreviation, to make it more machine friendly. For
437 binary files, outputs two <tt>-</tt> instead of saying
438 <tt>0 0</tt>.
439</p>
440</dd>
441<dt>
442--shortstat
443</dt>
444<dd>
445<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]446 Output only the last line of the <tt>--stat</tt> format containing total
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]447 number of modified files, as well as number of added and deleted
448 lines.
449</p>
450</dd>
451<dt>
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]452--dirstat[=limit]
453</dt>
454<dd>
455<p>
Junio C Hamanoa2f46622008-09-03 05:20:31[diff] [blame]456 Output the distribution of relative amount of changes (number of lines added or
457 removed) for each sub-directory. Directories with changes below
458 a cut-off percent (3% by default) are not shown. The cut-off percent
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]459 can be set with <tt>--dirstat=limit</tt>. Changes in a child directory is not
460 counted for the parent directory, unless <tt>--cumulative</tt> is used.
Junio C Hamano6a45be92008-04-22 08:19:03[diff] [blame]461</p>
462</dd>
463<dt>
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]464--dirstat-by-file[=limit]
465</dt>
466<dd>
467<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]468 Same as <tt>--dirstat</tt>, but counts changed files instead of lines.
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]469</p>
470</dd>
471<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]472--summary
473</dt>
474<dd>
475<p>
476 Output a condensed summary of extended header information
477 such as creations, renames and mode changes.
478</p>
479</dd>
480<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]481--no-renames
482</dt>
483<dd>
484<p>
485 Turn off rename detection, even when the configuration
486 file gives the default to do so.
487</p>
488</dd>
489<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]490--full-index
491</dt>
492<dd>
493<p>
Junio C Hamano5cf43ca2008-08-20 09:14:14[diff] [blame]494 Instead of the first handful of characters, show the full
495 pre- and post-image blob object names on the "index"
496 line when generating patch format output.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]497</p>
498</dd>
499<dt>
500--binary
501</dt>
502<dd>
503<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]504 In addition to <tt>--full-index</tt>, output a binary diff that
505 can be applied with <tt>git-apply</tt>.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]506</p>
507</dd>
508<dt>
509--abbrev[=&lt;n&gt;]
510</dt>
511<dd>
512<p>
513 Instead of showing the full 40-byte hexadecimal object
514 name in diff-raw format output and diff-tree header
Junio C Hamano6efe3022009-01-13 16:47:56[diff] [blame]515 lines, show only a partial prefix. This is
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]516 independent of the <tt>--full-index</tt> option above, which controls
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]517 the diff-patch output format. Non default number of
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]518 digits can be specified with <tt>--abbrev=&lt;n&gt;</tt>.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]519</p>
520</dd>
521<dt>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]522-B[&lt;n&gt;][/&lt;m&gt;]
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]523</dt>
524<dd>
525<p>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]526 Break complete rewrite changes into pairs of delete and
527 create. This serves two purposes:
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]528</p>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]529<div class="para"><p>It affects the way a change that amounts to a total rewrite of a file
530not as a series of deletion and insertion mixed together with a very
531few lines that happen to match textually as the context, but as a
532single deletion of everything old followed by a single insertion of
533everything new, and the number <tt>m</tt> controls this aspect of the -B
534option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
535original should remain in the result for git to consider it a total
536rewrite (i.e. otherwise the resulting patch will be a series of
537deletion and insertion mixed together with context lines).</p></div>
538<div class="para"><p>When used with -M, a totally-rewritten file is also considered as the
539source of a rename (usually -M only considers a file that disappeared
540as the source of a rename), and the number <tt>n</tt> controls this aspect of
541the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
542addition and deletion compared to 20% or more of the file's size are
543eligible for being picked up as a possible source of a rename to
544another file.</p></div>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]545</dd>
546<dt>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]547-M[&lt;n&gt;]
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]548</dt>
549<dd>
550<p>
551 Detect renames.
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]552 If <tt>n</tt> is specified, it is a is a threshold on the similarity
553 index (i.e. amount of addition/deletions compared to the
554 file's size). For example, <tt>-M90%</tt> means git should consider a
555 delete/add pair to be a rename if more than 90% of the file
556 hasn't changed.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]557</p>
558</dd>
559<dt>
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]560-C[&lt;n&gt;]
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]561</dt>
562<dd>
563<p>
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]564 Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
Junio C Hamanoe85e36f2010-08-10 05:30:14[diff] [blame]565 If <tt>n</tt> is specified, it has the same meaning as for <tt>-M&lt;n&gt;</tt>.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]566</p>
567</dd>
568<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]569--find-copies-harder
570</dt>
571<dd>
572<p>
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]573 For performance reasons, by default, <tt>-C</tt> option finds copies only
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]574 if the original file of the copy was modified in the same
575 changeset. This flag makes the command
576 inspect unmodified files as candidates for the source of
577 copy. This is a very expensive operation for large
Junio C Hamano16f98872007-06-12 16:09:14[diff] [blame]578 projects, so use it with caution. Giving more than one
579 <tt>-C</tt> option has the same effect.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]580</p>
581</dd>
582<dt>
583-l&lt;num&gt;
584</dt>
585<dd>
586<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]587 The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]588 is the number of potential rename/copy targets. This
589 option prevents rename/copy detection from running if
590 the number of rename/copy targets exceeds the specified
591 number.
592</p>
593</dd>
594<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]595-O&lt;orderfile&gt;
596</dt>
597<dd>
598<p>
599 Output the patch in the order specified in the
600 &lt;orderfile&gt;, which has one shell glob pattern per line.
601</p>
602</dd>
603<dt>
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]604-a
605</dt>
606<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]607--text
608</dt>
609<dd>
610<p>
611 Treat all files as text.
612</p>
613</dd>
614<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]615--ignore-space-at-eol
616</dt>
617<dd>
618<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]619 Ignore changes in whitespace at EOL.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]620</p>
621</dd>
622<dt>
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]623-b
624</dt>
625<dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]626--ignore-space-change
627</dt>
628<dd>
629<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]630 Ignore changes in amount of whitespace. This ignores whitespace
631 at line end, and considers all other sequences of one or
632 more whitespace characters to be equivalent.
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]633</p>
634</dd>
635<dt>
Junio C Hamanobbbb8652008-12-29 10:34:22[diff] [blame]636-w
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]637</dt>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]638<dt>
639--ignore-all-space
640</dt>
641<dd>
642<p>
Junio C Hamano3a702342007-12-12 21:34:02[diff] [blame]643 Ignore whitespace when comparing lines. This ignores
644 differences even if one line has whitespace where the other
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]645 line has none.
646</p>
647</dd>
648<dt>
Junio C Hamano1d40ee82009-01-07 10:14:16[diff] [blame]649--inter-hunk-context=&lt;lines&gt;
650</dt>
651<dd>
652<p>
653 Show the context between diff hunks, up to the specified number
654 of lines, thereby fusing hunks that are close to each other.
655</p>
656</dd>
657<dt>
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]658--ext-diff
659</dt>
660<dd>
661<p>
662 Allow an external diff helper to be executed. If you set an
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]663 external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
664 to use this option with <a href="git-log.html">git-log(1)</a> and friends.
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]665</p>
666</dd>
667<dt>
668--no-ext-diff
669</dt>
670<dd>
671<p>
672 Disallow external diff drivers.
673</p>
674</dd>
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]675<dt>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]676--ignore-submodules[=&lt;when&gt;]
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]677</dt>
678<dd>
679<p>
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]680 Ignore changes to submodules in the diff generation. &lt;when&gt; can be
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]681 either "none", "untracked", "dirty" or "all", which is the default
682 Using "none" will consider the submodule modified when it either contains
683 untracked or modified files or its HEAD differs from the commit recorded
684 in the superproject and can be used to override any settings of the
685 <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]686 "untracked" is used submodules are not considered dirty when they only
687 contain untracked content (but they are still scanned for modified
688 content). Using "dirty" ignores all changes to the work tree of submodules,
689 only changes to the commits stored in the superproject are shown (this was
690 the behavior until 1.7.0). Using "all" hides all changes to submodules.
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]691</p>
692</dd>
693<dt>
Junio C Hamanoe27cbd22007-12-21 17:57:33[diff] [blame]694--src-prefix=&lt;prefix&gt;
695</dt>
696<dd>
697<p>
698 Show the given source prefix instead of "a/".
699</p>
700</dd>
701<dt>
702--dst-prefix=&lt;prefix&gt;
703</dt>
704<dd>
705<p>
706 Show the given destination prefix instead of "b/".
707</p>
708</dd>
709<dt>
710--no-prefix
711</dt>
712<dd>
713<p>
714 Do not show any source or destination prefix.
715</p>
716</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]717</dl></div>
718<div class="para"><p>For more detailed explanation on these common options, see also
719<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
720<div class="vlist"><dl>
Junio C Hamano60f8aa82007-03-06 09:58:26[diff] [blame]721<dt>
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]722-&lt;n&gt;
723</dt>
724<dd>
725<p>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame^]726 Prepare patches from the topmost &lt;n&gt; commits.
Junio C Hamanobb0f4042007-07-04 06:41:40[diff] [blame]727</p>
728</dd>
729<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]730-o &lt;dir&gt;
731</dt>
732<dt>
733--output-directory &lt;dir&gt;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]734</dt>
735<dd>
736<p>
737 Use &lt;dir&gt; to store the resulting files, instead of the
Junio C Hamano1bab4b02006-06-06 21:58:33[diff] [blame]738 current working directory.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]739</p>
740</dd>
741<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]742-n
743</dt>
744<dt>
745--numbered
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]746</dt>
747<dd>
748<p>
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]749 Name output in <em>[PATCH n/m]</em> format, even with a single patch.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]750</p>
751</dd>
752<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]753-N
754</dt>
755<dt>
756--no-numbered
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]757</dt>
758<dd>
759<p>
760 Name output in <em>[PATCH]</em> format.
761</p>
762</dd>
763<dt>
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]764--start-number &lt;n&gt;
765</dt>
766<dd>
767<p>
768 Start numbering the patches at &lt;n&gt; instead of 1.
769</p>
770</dd>
771<dt>
Junio C Hamano94cad1a2007-06-06 10:48:25[diff] [blame]772--numbered-files
773</dt>
774<dd>
775<p>
776 Output file names will be a simple number sequence
777 without the default first line of the commit appended.
Junio C Hamano94cad1a2007-06-06 10:48:25[diff] [blame]778</p>
779</dd>
780<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]781-k
782</dt>
783<dt>
784--keep-subject
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]785</dt>
786<dd>
787<p>
788 Do not strip/add <em>[PATCH]</em> from the first line of the
789 commit log message.
790</p>
791</dd>
792<dt>
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]793-s
794</dt>
795<dt>
796--signoff
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]797</dt>
798<dd>
799<p>
800 Add <tt>Signed-off-by:</tt> line to the commit message, using
801 the committer identity of yourself.
802</p>
803</dd>
804<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]805--stdout
806</dt>
807<dd>
808<p>
Junio C Hamano341071d2006-06-04 07:24:48[diff] [blame]809 Print all commits to the standard output in mbox format,
810 instead of creating a file for each one.
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]811</p>
812</dd>
Junio C Hamano2496ae42006-03-11 08:04:33[diff] [blame]813<dt>
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]814--attach[=&lt;boundary&gt;]
Junio C Hamano2496ae42006-03-11 08:04:33[diff] [blame]815</dt>
816<dd>
817<p>
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]818 Create multipart/mixed attachment, the first part of
819 which is the commit message and the patch itself in the
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]820 second part, with <tt>Content-Disposition: attachment</tt>.
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]821</p>
822</dd>
823<dt>
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]824--no-attach
825</dt>
826<dd>
827<p>
828 Disable the creation of an attachment, overriding the
829 configuration setting.
830</p>
831</dd>
832<dt>
Junio C Hamanoc51fede2007-03-12 07:29:20[diff] [blame]833--inline[=&lt;boundary&gt;]
834</dt>
835<dd>
836<p>
837 Create multipart/mixed attachment, the first part of
838 which is the commit message and the patch itself in the
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]839 second part, with <tt>Content-Disposition: inline</tt>.
Junio C Hamano2496ae42006-03-11 08:04:33[diff] [blame]840</p>
841</dd>
Junio C Hamanof9ca97d2006-07-25 22:23:09[diff] [blame]842<dt>
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]843--thread[=&lt;style&gt;]
Junio C Hamanof9ca97d2006-07-25 22:23:09[diff] [blame]844</dt>
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]845<dt>
846--no-thread
847</dt>
Junio C Hamanof9ca97d2006-07-25 22:23:09[diff] [blame]848<dd>
849<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]850 Controls addition of <tt>In-Reply-To</tt> and <tt>References</tt> headers to
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]851 make the second and subsequent mails appear as replies to the
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]852 first. Also controls generation of the <tt>Message-Id</tt> header to
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]853 reference.
Junio C Hamanof9ca97d2006-07-25 22:23:09[diff] [blame]854</p>
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]855<div class="para"><p>The optional &lt;style&gt; argument can be either <tt>shallow</tt> or <tt>deep</tt>.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]856<em>shallow</em> threading makes every mail a reply to the head of the
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]857series, where the head is chosen from the cover letter, the
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]858<tt>--in-reply-to</tt>, and the first patch mail, in this order. <em>deep</em>
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]859threading makes every mail a reply to the previous one.</p></div>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]860<div class="para"><p>The default is <tt>--no-thread</tt>, unless the <em>format.thread</em> configuration
861is set. If <tt>--thread</tt> is specified without a style, it defaults to the
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]862style specified by <em>format.thread</em> if any, or else <tt>shallow</tt>.</p></div>
863<div class="para"><p>Beware that the default for <em>git send-email</em> is to thread emails
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]864itself. If you want <tt>git format-patch</tt> to take care of threading, you
865will want to ensure that threading is disabled for <tt>git send-email</tt>.</p></div>
Junio C Hamanof9ca97d2006-07-25 22:23:09[diff] [blame]866</dd>
867<dt>
868--in-reply-to=Message-Id
869</dt>
870<dd>
871<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]872 Make the first mail (or all the mails with <tt>--no-thread</tt>) appear as a
Junio C Hamanof9ca97d2006-07-25 22:23:09[diff] [blame]873 reply to the given Message-Id, which avoids breaking threads to
874 provide a new patch series.
875</p>
876</dd>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]877<dt>
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]878--ignore-if-in-upstream
879</dt>
880<dd>
881<p>
882 Do not include a patch that matches a commit in
883 &lt;until&gt;..&lt;since&gt;. This will examine all patches reachable
884 from &lt;since&gt; but not from &lt;until&gt; and compare them with the
885 patches being generated, and any patch that matches is
886 ignored.
887</p>
888</dd>
889<dt>
Junio C Hamano6f1cca82007-04-12 05:02:47[diff] [blame]890--subject-prefix=&lt;Subject-Prefix&gt;
891</dt>
892<dd>
893<p>
894 Instead of the standard <em>[PATCH]</em> prefix in the subject
895 line, instead use <em>[&lt;Subject-Prefix&gt;]</em>. This
896 allows for useful naming of a patch series, and can be
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]897 combined with the <tt>--numbered</tt> option.
Junio C Hamano6f1cca82007-04-12 05:02:47[diff] [blame]898</p>
899</dd>
900<dt>
Junio C Hamanoea90ab32010-03-15 20:32:55[diff] [blame]901--to=&lt;email&gt;
902</dt>
903<dd>
904<p>
905 Add a <tt>To:</tt> header to the email headers. This is in addition
906 to any configured headers, and may be used multiple times.
907</p>
908</dd>
909<dt>
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]910--cc=&lt;email&gt;
911</dt>
912<dd>
913<p>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]914 Add a <tt>Cc:</tt> header to the email headers. This is in addition
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]915 to any configured headers, and may be used multiple times.
916</p>
917</dd>
918<dt>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]919--add-header=&lt;header&gt;
920</dt>
921<dd>
922<p>
923 Add an arbitrary header to the email headers. This is in addition
924 to any configured headers, and may be used multiple times.
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]925 For example, <tt>--add-header="Organization: git-foo"</tt>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]926</p>
927</dd>
928<dt>
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]929--cover-letter
930</dt>
931<dd>
932<p>
Junio C Hamano92a4abd2008-08-15 05:34:44[diff] [blame]933 In addition to the patches, generate a cover letter file
934 containing the shortlog and the overall diffstat. You can
935 fill in a description in the file before sending it out.
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]936</p>
937</dd>
938<dt>
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]939--[no]-signature=&lt;signature&gt;
940</dt>
941<dd>
942<p>
943 Add a signature to each message produced. Per RFC 3676 the signature
944 is separated from the body by a line with <em>-- </em> on it. If the
945 signature option is omitted the signature defaults to the git version
946 number.
947</p>
948</dd>
949<dt>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]950--suffix=.&lt;sfx&gt;
951</dt>
952<dd>
953<p>
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]954 Instead of using <tt>.patch</tt> as the suffix for generated
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]955 filenames, use specified suffix. A common alternative is
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]956 <tt>--suffix=.txt</tt>. Leaving this empty will remove the <tt>.patch</tt>
957 suffix.
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]958</p>
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]959<div class="para"><p>Note that the leading character does not have to be a dot; for example,
960you can use <tt>--suffix=-patch</tt> to get <tt>0001-description-of-my-change-patch</tt>.</p></div>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]961</dd>
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]962<dt>
963--no-binary
964</dt>
965<dd>
966<p>
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]967 Do not output contents of changes in binary files, instead
968 display a notice that those files changed. Patches generated
969 using this option cannot be applied properly, but they are
970 still useful for code review.
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]971</p>
972</dd>
Junio C Hamano9572e922009-04-02 06:52:03[diff] [blame]973<dt>
974--root
975</dt>
976<dd>
977<p>
978 Treat the revision argument as a &lt;revision range&gt;, even if it
979 is just a single commit (that would normally be treated as a
980 &lt;since&gt;). Note that root commits included in the specified
981 range are always formatted as creation patches, independently
982 of this flag.
983</p>
984</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]985</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]986</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]987<h2 id="_configuration">CONFIGURATION</h2>
Junio C Hamano2496ae42006-03-11 08:04:33[diff] [blame]988<div class="sectionbody">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]989<div class="para"><p>You can specify extra mail header lines to be added to each message,
990defaults for the subject prefix and file suffix, number patches when
Junio C Hamanoea90ab32010-03-15 20:32:55[diff] [blame]991outputting more than one patch, add "To" or "Cc:" headers, configure
992attachments, and sign off patches with configuration variables.</p></div>
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]993<div class="listingblock">
Junio C Hamano2496ae42006-03-11 08:04:33[diff] [blame]994<div class="content">
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]995<pre><tt>[format]
996 headers = "Organization: git-foo\n"
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]997 subjectprefix = CHANGE
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]998 suffix = .txt
Junio C Hamano2fbcd212008-05-14 22:26:07[diff] [blame]999 numbered = auto
Junio C Hamanoea90ab32010-03-15 20:32:55[diff] [blame]1000 to = &lt;email&gt;
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]1001 cc = &lt;email&gt;
Junio C Hamano5f9a6f02009-04-06 08:26:56[diff] [blame]1002 attach [ = mime-boundary-string ]
1003 signoff = true</tt></pre>
Junio C Hamano4f9a6052007-01-17 20:25:16[diff] [blame]1004</div></div>
Junio C Hamano2496ae42006-03-11 08:04:33[diff] [blame]1005</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1006<h2 id="_examples">EXAMPLES</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1007<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1008<div class="ilist"><ul>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1009<li>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1010<p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1011Extract commits between revisions R1 and R2, and apply them on top of
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1012the current branch using <em>git am</em> to cherry-pick them:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1013</p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1014<div class="listingblock">
1015<div class="content">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1016<pre><tt>$ git format-patch -k --stdout R1..R2 | git am -3 -k</tt></pre>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1017</div></div>
1018</li>
1019<li>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1020<p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1021Extract all commits which are in the current branch but not in the
1022origin branch:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1023</p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1024<div class="listingblock">
1025<div class="content">
1026<pre><tt>$ git format-patch origin</tt></pre>
1027</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1028<div class="para"><p>For each commit a separate file is created in the current directory.</p></div>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1029</li>
1030<li>
Junio C Hamano7d9e9bd2007-08-29 07:31:47[diff] [blame]1031<p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1032Extract all commits that lead to <em>origin</em> since the inception of the
1033project:
Junio C Hamano7d9e9bd2007-08-29 07:31:47[diff] [blame]1034</p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1035<div class="listingblock">
1036<div class="content">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1037<pre><tt>$ git format-patch --root origin</tt></pre>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1038</div></div>
1039</li>
1040<li>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1041<p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1042The same as the previous one:
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1043</p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1044<div class="listingblock">
1045<div class="content">
1046<pre><tt>$ git format-patch -M -B origin</tt></pre>
1047</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1048<div class="para"><p>Additionally, it detects and handles renames and complete rewrites
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1049intelligently to produce a renaming patch. A renaming patch reduces
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1050the amount of text output, and generally makes it easier to review.
1051Note that non-git "patch" programs won't understand renaming patches, so
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1052use it only when you know the recipient uses git to apply your patch.</p></div>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1053</li>
1054<li>
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]1055<p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1056Extract three topmost commits from the current branch and format them
1057as e-mailable patches:
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]1058</p>
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1059<div class="listingblock">
1060<div class="content">
1061<pre><tt>$ git format-patch -3</tt></pre>
1062</div></div>
1063</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1064</ul></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1065</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1066<h2 id="_see_also">SEE ALSO</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1067<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1068<div class="para"><p><a href="git-am.html">git-am(1)</a>, <a href="git-send-email.html">git-send-email(1)</a></p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1069</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1070<h2 id="_author">Author</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1071<div class="sectionbody">
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]1072<div class="para"><p>Written by Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1073</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1074<h2 id="_documentation">Documentation</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1075<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1076<div class="para"><p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1077</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1078<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1079<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1080<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1081</div>
1082<div id="footer">
1083<div id="footer-text">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame^]1084Last updated 2010-09-30 00:02:57 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]1085</div>
1086</div>
1087</body>
1088</html>