Google Git
Sign in
chromium / external / gitster / git-htmldocs / 3e3aa8124a1b317bf174b7ee064b96c1399cfb8d / . / git-rerere.html
blob: 07a4bd56b5742b2dede7f63d75ad1e3a3a26a710 [file] [log] [blame]
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[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 Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]306</style>
307<title>git-rerere(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-rerere(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-rerere -
Junio C Hamano7c73c662007-01-19 00:37:50[diff] [blame]317 Reuse recorded resolution of conflicted merges
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamano3e3aa812010-07-05 23:25:23[diff] [blame^]323<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [&lt;pathspec&gt;]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]324</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]325<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]326<div class="sectionbody">
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]327<div class="para"><p>In a workflow employing relatively long lived topic branches,
328the developer sometimes needs to resolve the same conflicts over
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]329and over again until the topic branches are done (either merged
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]330to the "release" branch, or sent out and accepted upstream).</p></div>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]331<div class="para"><p>This command assists the developer in this process by recording
332conflicted automerge results and corresponding hand resolve results
333on the initial manual merge, and applying previously recorded
334hand resolutions to their corresponding automerge results.</p></div>
Junio C Hamano0e47b232008-01-15 08:31:10[diff] [blame]335<div class="admonitionblock">
336<table><tr>
337<td class="icon">
338<div class="title">Note</div>
339</td>
Junio C Hamano543f8d62009-07-29 08:35:21[diff] [blame]340<td class="content">You need to set the configuration variable rerere.enabled in order to
Junio C Hamano0e47b232008-01-15 08:31:10[diff] [blame]341enable this command.</td>
342</tr></table>
343</div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]344</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]345<h2 id="_commands">COMMANDS</h2>
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]346<div class="sectionbody">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]347<div class="para"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]348However, it has several commands that allow it to interact with
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]349its working state.</p></div>
350<div class="vlist"><dl>
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]351<dt>
352<em>clear</em>
353</dt>
354<dd>
355<p>
356This resets the metadata used by rerere if a merge resolution is to be
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]357aborted. Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--abort]</em>
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]358will automatically invoke this command.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]359</p>
360</dd>
361<dt>
Junio C Hamano3e3aa812010-07-05 23:25:23[diff] [blame^]362<em>forget</em> &lt;pathspec&gt;
363</dt>
364<dd>
365<p>
366This resets the conflict resolutions which rerere has recorded for the current
367conflict in &lt;pathspec&gt;. The &lt;pathspec&gt; is optional.
368</p>
369</dd>
370<dt>
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]371<em>diff</em>
372</dt>
373<dd>
374<p>
375This displays diffs for the current state of the resolution. It is
376useful for tracking what has changed while the user is resolving
377conflicts. Additional arguments are passed directly to the system
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]378<em>diff</em> command installed in PATH.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]379</p>
380</dd>
381<dt>
382<em>status</em>
383</dt>
384<dd>
385<p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]386Like <em>diff</em>, but this only prints the filenames that will be tracked
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]387for resolutions.
388</p>
389</dd>
390<dt>
391<em>gc</em>
392</dt>
393<dd>
394<p>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]395This prunes records of conflicted merges that
396occurred a long time ago. By default, unresolved conflicts older
397than 15 days and resolved conflicts older than 60
398days are pruned. These defaults are controlled via the
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]399<tt>gc.rerereunresolved</tt> and <tt>gc.rerereresolved</tt> configuration
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]400variables respectively.
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]401</p>
402</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]403</dl></div>
Junio C Hamanoe7935c42006-12-13 21:32:17[diff] [blame]404</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]405<h2 id="_discussion">DISCUSSION</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]406<div class="sectionbody">
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]407<div class="para"><p>When your topic branch modifies an overlapping area that your
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]408master branch (or upstream) touched since your topic branch
409forked from it, you may want to test it with the latest master,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]410even before your topic branch is ready to be pushed upstream:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]411<div class="listingblock">
412<div class="content">
413<pre><tt> o---*---o topic
414 /
415 o---o---o---*---o---o master</tt></pre>
416</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]417<div class="para"><p>For such a test, you need to merge master and topic somehow.
418One way to do it is to pull master into the topic branch:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]419<div class="listingblock">
420<div class="content">
421<pre><tt> $ git checkout topic
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]422 $ git merge master
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]423
424 o---*---o---+ topic
425 / /
426 o---o---o---*---o---o master</tt></pre>
427</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]428<div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]429file; you need to resolve the conflicts when creating the commit
Junio C Hamanofaa1e502008-08-10 03:55:58[diff] [blame]430marked with <tt>&#43;</tt>. Then you can test the result to make sure your
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]431work-in-progress still works with what is in the latest master.</p></div>
432<div class="para"><p>After this test merge, there are two ways to continue your work
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]433on the topic. The easiest is to build on top of the test merge
Junio C Hamanofaa1e502008-08-10 03:55:58[diff] [blame]434commit <tt>&#43;</tt>, and when your work in the topic branch is finally
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]435ready, pull the topic branch into master, and/or ask the
436upstream to pull from you. By that time, however, the master or
Junio C Hamanofaa1e502008-08-10 03:55:58[diff] [blame]437the upstream might have been advanced since the test merge <tt>&#43;</tt>,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]438in which case the final commit graph would look like this:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]439<div class="listingblock">
440<div class="content">
441<pre><tt> $ git checkout topic
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]442 $ git merge master
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]443 $ ... work on both topic and master branches
444 $ git checkout master
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]445 $ git merge topic
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]446
447 o---*---o---+---o---o topic
448 / / \
449 o---o---o---*---o---o---o---o---+ master</tt></pre>
450</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]451<div class="para"><p>When your topic branch is long-lived, however, your topic branch
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]452would end up having many such "Merge from master" commits on it,
453which would unnecessarily clutter the development history.
454Readers of the Linux kernel mailing list may remember that Linus
455complained about such too frequent test merges when a subsystem
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]456maintainer asked to pull from a branch full of "useless merges".</p></div>
457<div class="para"><p>As an alternative, to keep the topic branch clean of test
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]458merges, you could blow away the test merge, and keep building on
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]459top of the tip before the test merge:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]460<div class="listingblock">
461<div class="content">
462<pre><tt> $ git checkout topic
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]463 $ git merge master
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]464 $ git reset --hard HEAD^ ;# rewind the test merge
465 $ ... work on both topic and master branches
466 $ git checkout master
Junio C Hamanoedd2b0a2007-01-15 06:12:45[diff] [blame]467 $ git merge topic
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]468
469 o---*---o-------o---o topic
470 / \
471 o---o---o---*---o---o---o---o---+ master</tt></pre>
472</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]473<div class="para"><p>This would leave only one merge commit when your topic branch is
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]474finally ready and merged into the master branch. This merge
475would require you to resolve the conflict, introduced by the
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]476commits marked with <tt>*</tt>. However, this conflict is often the
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]477same conflict you resolved when you created the test merge you
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]478blew away. <em>git rerere</em> helps you resolve this final
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]479conflicted merge using the information from your earlier hand
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]480resolve.</p></div>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]481<div class="para"><p>Running the <em>git rerere</em> command immediately after a conflicted
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]482automerge records the conflicted working tree files, with the
483usual conflict markers <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt>, <tt>=======</tt>, and <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> in
484them. Later, after you are done resolving the conflicts,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]485running <em>git rerere</em> again will record the resolved state of these
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]486files. Suppose you did this when you created the test merge of
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]487master into the topic branch.</p></div>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]488<div class="para"><p>Next time, after seeing the same conflicted automerge,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]489running <em>git rerere</em> will perform a three-way merge between the
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]490earlier conflicted automerge, the earlier manual resolution, and
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]491the current conflicted automerge.
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]492If this three-way merge resolves cleanly, the result is written
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]493out to your working tree file, so you do not have to manually
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]494resolve it. Note that <em>git rerere</em> leaves the index file alone,
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]495so you still need to do the final sanity checks with <tt>git diff</tt>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]496(or <tt>git diff -c</tt>) and <em>git add</em> when you are satisfied.</p></div>
497<div class="para"><p>As a convenience measure, <em>git merge</em> automatically invokes
498<em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]499records the hand resolve when it is a new conflict, or reuses the earlier hand
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]500resolve when it is not. <em>git commit</em> also invokes <em>git rerere</em>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]501when committing a merge result. What this means is that you do
502not have to do anything special yourself (besides enabling
503the rerere.enabled config variable).</p></div>
504<div class="para"><p>In our example, when you do the test merge, the manual
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]505resolution is recorded, and it will be reused when you do the
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]506actual merge later with the updated master and topic branch, as long
507as the recorded resolution is still applicable.</p></div>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]508<div class="para"><p>The information <em>git rerere</em> records is also used when running
509<em>git rebase</em>. After blowing away the test merge and continuing
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]510development on the topic branch:</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]511<div class="listingblock">
512<div class="content">
513<pre><tt> o---*---o-------o---o topic
514 /
515 o---o---o---*---o---o---o---o master
516
517 $ git rebase master topic
518
519 o---*---o-------o---o topic
520 /
521 o---o---o---*---o---o---o---o master</tt></pre>
522</div></div>
Junio C Hamano25e7ba62009-06-14 01:03:22[diff] [blame]523<div class="para"><p>you could run <tt>git rebase master topic</tt>, to bring yourself
524up-to-date before your topic is ready to be sent upstream.
525This would result in falling back to a three-way merge, and it
526would conflict the same way as the test merge you resolved earlier.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]527<em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]528conflict.</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]529</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]530<h2 id="_author">Author</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]531<div class="sectionbody">
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]532<div class="para"><p>Written by Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]533</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]534<h2 id="_git">GIT</h2>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]535<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]536<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]537</div>
538<div id="footer">
539<div id="footer-text">
Junio C Hamano3e3aa812010-07-05 23:25:23[diff] [blame^]540Last updated 2010-07-05 23:25:08 UTC
Junio C Hamano40f2f8d2006-02-07 08:04:39[diff] [blame]541</div>
542</div>
543</body>
544</html>