| blob | 12e22b28904578489665e23b1a814e5e5213e774 |
4 <head>
9 /* Debug borders */
11 /*
12 border: 1px solid red;
13 */
14 }
16 body {
18 }
20 a {
23 }
26 }
28 em {
31 }
33 strong {
36 }
38 tt {
40 }
48 }
52 }
53 h2 {
55 }
56 h3 {
58 }
59 h3 + * {
61 }
66 }
68 hr {
70 }
72 p {
75 }
79 }
81 pre {
84 }
86 span#author {
91 }
92 span#email {
93 }
96 }
98 div#footer {
104 }
105 div#footer-text {
108 }
109 div#footer-badges {
112 }
114 div#preamble {
117 }
123 }
127 }
131 }
133 /* Block element titles. */
141 }
144 }
148 }
151 }
154 }
160 }
166 }
171 }
175 }
180 }
183 }
187 }
188 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
191 }
200 }
204 }
209 }
215 dl {
218 }
219 dt {
224 }
227 }
231 }
234 }
237 }
240 }
243 }
246 }
253 }
257 }
258 thead {
261 }
262 tfoot {
264 }
267 }
270 }
271 /* Because the table frame attribute is overriden by CSS in most browsers. */
274 }
278 }
282 }
288 }
291 }
294 }
300 }
303 }
307 }
311 }
315 }
317 div#toctitle {
324 }
329 }
333 }
337 }
341 }
342 /* Overrides for manpage documents */
343 h1 {
348 }
349 h2 {
351 }
354 }
358 }
360 /* Workarounds for IE6's broken and incomplete CSS2. */
366 }
373 }
379 }
384 }
388 }
392 }
397 }
399 /* IE6 sets dynamically generated links as visited. */
401 </style>
402 </head>
403 <body>
405 <h1>
406 git-rerere(1) Manual Page
407 </h1>
410 <p>git-rerere -
411 Reuse recorded resolution of conflicted merges
412 </p>
413 </div>
414 </div>
418 <div class="verseblock-content"><em>git rerere</em> [<em>clear</em>|<em>forget</em> <pathspec>|<em>diff</em>|<em>status</em>|<em>gc</em>]</div>
420 </div></div>
421 </div>
425 the developer sometimes needs to resolve the same conflicts over
426 and over again until the topic branches are done (either merged
429 conflicted automerge results and corresponding hand resolve results
430 on the initial manual merge, and applying previously recorded
431 hand resolutions to their corresponding automerge results.</p></div>
433 <table><tr>
436 </td>
438 enable this command.</td>
439 </tr></table>
440 </div>
441 </div>
444 <div class="paragraph"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention.
445 However, it has several commands that allow it to interact with
446 its working state.</p></div>
450 </dt>
451 <dd>
452 <p>
453 This resets the metadata used by rerere if a merge resolution is to be
455 will automatically invoke this command.
456 </p>
457 </dd>
460 </dt>
461 <dd>
462 <p>
463 This resets the conflict resolutions which rerere has recorded for the current
465 </p>
466 </dd>
469 </dt>
470 <dd>
471 <p>
472 This displays diffs for the current state of the resolution. It is
473 useful for tracking what has changed while the user is resolving
474 conflicts. Additional arguments are passed directly to the system
476 </p>
477 </dd>
480 </dt>
481 <dd>
482 <p>
484 for resolutions.
485 </p>
486 </dd>
489 </dt>
490 <dd>
491 <p>
492 This prunes records of conflicted merges that
493 occurred a long time ago. By default, unresolved conflicts older
495 days are pruned. These defaults are controlled via the
497 variables respectively.
498 </p>
499 </dd>
500 </dl></div>
501 </div>
505 master branch (or upstream) touched since your topic branch
506 forked from it, you may want to test it with the latest master,
507 even before your topic branch is ready to be pushed upstream:</p></div>
510 <pre><tt> o---*---o topic
511 /
512 o---o---o---*---o---o master</tt></pre>
513 </div></div>
515 One way to do it is to pull master into the topic branch:</p></div>
518 <pre><tt> $ git checkout topic
519 $ git merge master
521 o---*---o---+ topic
522 / /
523 o---o---o---*---o---o master</tt></pre>
524 </div></div>
526 file; you need to resolve the conflicts when creating the commit
528 work-in-progress still works with what is in the latest master.</p></div>
530 on the topic. The easiest is to build on top of the test merge
532 ready, pull the topic branch into master, and/or ask the
533 upstream to pull from you. By that time, however, the master or
535 in which case the final commit graph would look like this:</p></div>
538 <pre><tt> $ git checkout topic
539 $ git merge master
540 $ ... work on both topic and master branches
541 $ git checkout master
542 $ git merge topic
544 o---*---o---+---o---o topic
545 / / \
546 o---o---o---*---o---o---o---o---+ master</tt></pre>
547 </div></div>
549 would end up having many such "Merge from master" commits on it,
550 which would unnecessarily clutter the development history.
551 Readers of the Linux kernel mailing list may remember that Linus
552 complained about such too frequent test merges when a subsystem
555 merges, you could blow away the test merge, and keep building on
556 top of the tip before the test merge:</p></div>
559 <pre><tt> $ git checkout topic
560 $ git merge master
561 $ git reset --hard HEAD^ ;# rewind the test merge
562 $ ... work on both topic and master branches
563 $ git checkout master
564 $ git merge topic
566 o---*---o-------o---o topic
567 / \
568 o---o---o---*---o---o---o---o---+ master</tt></pre>
569 </div></div>
571 finally ready and merged into the master branch. This merge
572 would require you to resolve the conflict, introduced by the
574 same conflict you resolved when you created the test merge you
576 conflicted merge using the information from your earlier hand
577 resolve.</p></div>
578 <div class="paragraph"><p>Running the <em>git rerere</em> command immediately after a conflicted
579 automerge records the conflicted working tree files, with the
580 usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in
581 them. Later, after you are done resolving the conflicts,
583 files. Suppose you did this when you created the test merge of
584 master into the topic branch.</p></div>
587 earlier conflicted automerge, the earlier manual resolution, and
588 the current conflicted automerge.
589 If this three-way merge resolves cleanly, the result is written
590 out to your working tree file, so you do not have to manually
596 records the hand resolve when it is a new conflict, or reuses the earlier hand
598 when committing a merge result. What this means is that you do
599 not have to do anything special yourself (besides enabling
600 the rerere.enabled config variable).</p></div>
602 resolution is recorded, and it will be reused when you do the
603 actual merge later with the updated master and topic branch, as long
604 as the recorded resolution is still applicable.</p></div>
607 development on the topic branch:</p></div>
610 <pre><tt> o---*---o-------o---o topic
611 /
612 o---o---o---*---o---o---o---o master
614 $ git rebase master topic
616 o---*---o-------o---o topic
617 /
618 o---o---o---*---o---o---o---o master</tt></pre>
619 </div></div>
621 up-to-date before your topic is ready to be sent upstream.
622 This would result in falling back to a three-way merge, and it
623 would conflict the same way as the test merge you resolved earlier.
625 conflict.</p></div>
626 </div>
630 </div>
634 </div>
635 </div>
636 </body>
637 </html>