Google Git
Sign in
chromium / external / gitster / git-htmldocs / d37473e2a262d1f0e9c59977086e3cc740b6278f / . / howto / rebase-from-internal-branch.html
blob: 40779b3e502322f4612f57eb51075a1a567587bd [file] [log] [blame]
Junio C Hamano944ce252018-05-30 22:25:26[diff] [blame]1<?xml version="1.0" encoding="UTF-8"?>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]2<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
5<head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]6<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoa85030a2022-07-27 16:48:21[diff] [blame]7<meta name="generator" content="AsciiDoc 10.2.0" />
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]8<title>How to rebase from an internal branch</title>
9<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]10/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
11
12/* Default font. */
13body {
14 font-family: Georgia,serif;
15}
16
17/* Title font. */
18h1, h2, h3, h4, h5, h6,
19div.title, caption.title,
20thead, p.table.header,
21#toctitle,
22#author, #revnumber, #revdate, #revremark,
23#footer {
24 font-family: Arial,Helvetica,sans-serif;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]25}
26
27body {
28 margin: 1em 5% 1em 5%;
29}
30
31a {
32 color: blue;
33 text-decoration: underline;
34}
35a:visited {
36 color: fuchsia;
37}
38
39em {
40 font-style: italic;
41 color: navy;
42}
43
44strong {
45 font-weight: bold;
46 color: #083194;
47}
48
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]49h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]51 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
54}
55
56h1, h2, h3 {
57 border-bottom: 2px solid silver;
58}
59h2 {
60 padding-top: 0.5em;
61}
62h3 {
63 float: left;
64}
65h3 + * {
66 clear: left;
67}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]68h5 {
69 font-size: 1.0em;
70}
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]71
72div.sectionbody {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]73 margin-left: 0;
74}
75
76hr {
77 border: 1px solid silver;
78}
79
80p {
81 margin-top: 0.5em;
82 margin-bottom: 0.5em;
83}
84
85ul, ol, li > p {
86 margin-top: 0;
87}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]88ul > li { color: #aaa; }
89ul > li > * { color: black; }
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]90
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]91.monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]95 padding: 0;
96 margin: 0;
97}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]98pre {
99 white-space: pre-wrap;
100}
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]101
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]102#author {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]103 color: #527bbd;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]104 font-weight: bold;
105 font-size: 1.1em;
106}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]107#email {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]108}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]109#revnumber, #revdate, #revremark {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]110}
111
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]112#footer {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]113 font-size: small;
114 border-top: 2px solid silver;
115 padding-top: 0.5em;
116 margin-top: 4.0em;
117}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]118#footer-text {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]119 float: left;
120 padding-bottom: 0.5em;
121}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]122#footer-badges {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]123 float: right;
124 padding-bottom: 0.5em;
125}
126
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]127#preamble {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
130}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]131div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]132div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133div.admonitionblock {
134 margin-top: 1.0em;
135 margin-bottom: 1.5em;
136}
137div.admonitionblock {
138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
142}
143
144div.content { /* Block element content. */
145 padding: 0;
146}
147
148/* Block element titles. */
149div.title, caption.title {
150 color: #527bbd;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]151 font-weight: bold;
152 text-align: left;
153 margin-top: 1.0em;
154 margin-bottom: 0.5em;
155}
156div.title + * {
157 margin-top: 0;
158}
159
160td div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content div.title:first-child {
164 margin-top: 0.0em;
165}
166div.content + div.title {
167 margin-top: 0.0em;
168}
169
170div.sidebarblock > div.content {
171 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]174 padding: 0.5em;
175}
176
177div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]181 padding: 0.5em;
182}
183
184div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
187 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]188 border-left: 5px solid #f0f0f0;
189 color: #888;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]190}
191
192div.quoteblock > div.attribution {
193 padding-top: 0.5em;
194 text-align: right;
195}
196
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]197div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]200}
201div.verseblock > div.attribution {
202 padding-top: 0.75em;
203 text-align: left;
204}
205/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
206div.verseblock + div.attribution {
207 text-align: left;
208}
209
210div.admonitionblock .icon {
211 vertical-align: top;
212 font-size: 1.1em;
213 font-weight: bold;
214 text-decoration: underline;
215 color: #527bbd;
216 padding-right: 0.5em;
217}
218div.admonitionblock td.content {
219 padding-left: 0.5em;
220 border-left: 3px solid #dddddd;
221}
222
223div.exampleblock > div.content {
224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
226}
227
228div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]229span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]230a.image:visited { color: white; }
231
232dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
235}
236dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
239 font-style: normal;
240 color: navy;
241}
242dd > *:first-child {
243 margin-top: 0.1em;
244}
245
246ul, ol {
247 list-style-position: outside;
248}
249ol.arabic {
250 list-style-type: decimal;
251}
252ol.loweralpha {
253 list-style-type: lower-alpha;
254}
255ol.upperalpha {
256 list-style-type: upper-alpha;
257}
258ol.lowerroman {
259 list-style-type: lower-roman;
260}
261ol.upperroman {
262 list-style-type: upper-roman;
263}
264
265div.compact ul, div.compact ol,
266div.compact p, div.compact p,
267div.compact div, div.compact div {
268 margin-top: 0.1em;
269 margin-bottom: 0.1em;
270}
271
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]272tfoot {
273 font-weight: bold;
274}
275td > div.verse {
276 white-space: pre;
277}
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]278
279div.hdlist {
280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
282}
283div.hdlist tr {
284 padding-bottom: 15px;
285}
286dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
288}
289td.hdlist1 {
290 vertical-align: top;
291 font-style: normal;
292 padding-right: 0.8em;
293 color: navy;
294}
295td.hdlist2 {
296 vertical-align: top;
297}
298div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
301}
302
303.comment {
304 background: yellow;
305}
306
307.footnote, .footnoteref {
308 font-size: 0.8em;
309}
310
311span.footnote, span.footnoteref {
312 vertical-align: super;
313}
314
315#footnotes {
316 margin: 20px 0 20px 0;
317 padding: 7px 0 0 0;
318}
319
320#footnotes div.footnote {
321 margin: 0 0 5px 0;
322}
323
324#footnotes hr {
325 border: none;
326 border-top: 1px solid silver;
327 height: 1px;
328 text-align: left;
329 margin-left: 0;
330 width: 20%;
331 min-width: 100px;
332}
333
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]334div.colist td {
335 padding-right: 0.5em;
336 padding-bottom: 0.3em;
337 vertical-align: top;
338}
339div.colist td img {
340 margin-top: 0.3em;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]341}
342
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]343@media print {
344 #footer-badges { display: none; }
345}
346
347#toc {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]348 margin-bottom: 2.5em;
349}
350
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]351#toctitle {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]352 color: #527bbd;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]353 font-size: 1.1em;
354 font-weight: bold;
355 margin-top: 1.0em;
356 margin-bottom: 0.1em;
357}
358
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]359div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]360 margin-top: 0;
361 margin-bottom: 0;
362}
363div.toclevel2 {
364 margin-left: 2em;
365 font-size: 0.9em;
366}
367div.toclevel3 {
368 margin-left: 4em;
369 font-size: 0.9em;
370}
371div.toclevel4 {
372 margin-left: 6em;
373 font-size: 0.9em;
374}
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]375
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]376span.aqua { color: aqua; }
377span.black { color: black; }
378span.blue { color: blue; }
379span.fuchsia { color: fuchsia; }
380span.gray { color: gray; }
381span.green { color: green; }
382span.lime { color: lime; }
383span.maroon { color: maroon; }
384span.navy { color: navy; }
385span.olive { color: olive; }
386span.purple { color: purple; }
387span.red { color: red; }
388span.silver { color: silver; }
389span.teal { color: teal; }
390span.white { color: white; }
391span.yellow { color: yellow; }
392
393span.aqua-background { background: aqua; }
394span.black-background { background: black; }
395span.blue-background { background: blue; }
396span.fuchsia-background { background: fuchsia; }
397span.gray-background { background: gray; }
398span.green-background { background: green; }
399span.lime-background { background: lime; }
400span.maroon-background { background: maroon; }
401span.navy-background { background: navy; }
402span.olive-background { background: olive; }
403span.purple-background { background: purple; }
404span.red-background { background: red; }
405span.silver-background { background: silver; }
406span.teal-background { background: teal; }
407span.white-background { background: white; }
408span.yellow-background { background: yellow; }
409
410span.big { font-size: 2em; }
411span.small { font-size: 0.6em; }
412
413span.underline { text-decoration: underline; }
414span.overline { text-decoration: overline; }
415span.line-through { text-decoration: line-through; }
416
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]417div.unbreakable { page-break-inside: avoid; }
418
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]419
420/*
421 * xhtml11 specific
422 *
423 * */
424
425div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]428}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]429div.tableblock > table {
430 border: 3px solid #527bbd;
431}
432thead, p.table.header {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]433 font-weight: bold;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]434 color: #527bbd;
435}
436p.table {
437 margin-top: 0;
438}
Junio C Hamano725b0da2020-01-22 22:02:40[diff] [blame]439/* Because the table frame attribute is overridden by CSS in most browsers. */
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]440div.tableblock > table[frame="void"] {
441 border-style: none;
442}
443div.tableblock > table[frame="hsides"] {
444 border-left-style: none;
445 border-right-style: none;
446}
447div.tableblock > table[frame="vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]450}
451
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]452
453/*
454 * html5 specific
455 *
456 * */
457
458table.tableblock {
459 margin-top: 1.0em;
460 margin-bottom: 1.5em;
461}
462thead, p.tableblock.header {
463 font-weight: bold;
464 color: #527bbd;
465}
466p.tableblock {
467 margin-top: 0;
468}
469table.tableblock {
470 border-width: 3px;
471 border-spacing: 0px;
472 border-style: solid;
473 border-color: #527bbd;
474 border-collapse: collapse;
475}
476th.tableblock, td.tableblock {
477 border-width: 1px;
478 padding: 4px;
479 border-style: solid;
480 border-color: #527bbd;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]481}
482
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]483table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
486}
487table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
490}
491table.tableblock.frame-none {
492 border-style: hidden;
493}
494
495th.tableblock.halign-left, td.tableblock.halign-left {
496 text-align: left;
497}
498th.tableblock.halign-center, td.tableblock.halign-center {
499 text-align: center;
500}
501th.tableblock.halign-right, td.tableblock.halign-right {
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]502 text-align: right;
503}
504
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]505th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]507}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]508th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
510}
511th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]513}
514
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]515
516/*
517 * manpage specific
518 *
519 * */
520
521body.manpage h1 {
522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
526}
527body.manpage h2 {
528 border-style: none;
529}
530body.manpage div.sectionbody {
531 margin-left: 3em;
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]532}
533
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]534@media print {
535 body.manpage div#toc { display: none; }
536}
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]537
538
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]539</style>
540<script type="text/javascript">
541/*<![CDATA[*/
Junio C Hamano2b153182021-12-15 21:00:31[diff] [blame]542var asciidoc = { // Namespace.
543
544/////////////////////////////////////////////////////////////////////
545// Table Of Contents generator
546/////////////////////////////////////////////////////////////////////
547
548/* Author: Mihai Bazon, September 2002
549 * http://students.infoiasi.ro/~mishoo
550 *
551 * Table Of Content generator
552 * Version: 0.4
553 *
554 * Feel free to use this script under the terms of the GNU General Public
555 * License, as long as you do not remove or alter this notice.
556 */
557
558 /* modified by Troy D. Hanson, September 2006. License: GPL */
559 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
560
561// toclevels = 1..4.
562toc: function (toclevels) {
563
564 function getText(el) {
565 var text = "";
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
568 text += i.data;
569 else if (i.firstChild != null)
570 text += getText(i);
571 }
572 return text;
573 }
574
575 function TocEntry(el, text, toclevel) {
576 this.element = el;
577 this.text = text;
578 this.toclevel = toclevel;
579 }
580
581 function tocEntries(el, toclevels) {
582 var result = new Array;
583 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
584 // Function that scans the DOM tree for header elements (the DOM2
585 // nodeIterator API would be a better technique but not supported by all
586 // browsers).
587 var iterate = function (el) {
588 for (var i = el.firstChild; i != null; i = i.nextSibling) {
589 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
590 var mo = re.exec(i.tagName);
591 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
592 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
593 }
594 iterate(i);
595 }
596 }
597 }
598 iterate(el);
599 return result;
600 }
601
602 var toc = document.getElementById("toc");
603 if (!toc) {
604 return;
605 }
606
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
609 var i;
610 for (i = 0; i < toc.childNodes.length; i++) {
611 var entry = toc.childNodes[i];
612 if (entry.nodeName.toLowerCase() == 'div'
613 && entry.getAttribute("class")
614 && entry.getAttribute("class").match(/^toclevel/))
615 tocEntriesToRemove.push(entry);
616 }
617 for (i = 0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
619 }
620
621 // Rebuild TOC entries.
622 var entries = tocEntries(document.getElementById("content"), toclevels);
623 for (var i = 0; i < entries.length; ++i) {
624 var entry = entries[i];
625 if (entry.element.id == "")
626 entry.element.id = "_toc_" + i;
627 var a = document.createElement("a");
628 a.href = "#" + entry.element.id;
629 a.appendChild(document.createTextNode(entry.text));
630 var div = document.createElement("div");
631 div.appendChild(a);
632 div.className = "toclevel" + entry.toclevel;
633 toc.appendChild(div);
634 }
635 if (entries.length == 0)
636 toc.parentNode.removeChild(toc);
637},
638
639
640/////////////////////////////////////////////////////////////////////
641// Footnotes generator
642/////////////////////////////////////////////////////////////////////
643
644/* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
646 */
647
648footnotes: function () {
649 // Delete existing footnote entries in case we're reloading the footnodes.
650 var i;
651 var noteholder = document.getElementById("footnotes");
652 if (!noteholder) {
653 return;
654 }
655 var entriesToRemove = [];
656 for (i = 0; i < noteholder.childNodes.length; i++) {
657 var entry = noteholder.childNodes[i];
658 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
659 entriesToRemove.push(entry);
660 }
661 for (i = 0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
663 }
664
665 // Rebuild footnote entries.
666 var cont = document.getElementById("content");
667 var spans = cont.getElementsByTagName("span");
668 var refs = {};
669 var n = 0;
670 for (i=0; i<spans.length; i++) {
671 if (spans[i].className == "footnote") {
672 n++;
673 var note = spans[i].getAttribute("data-note");
674 if (!note) {
675 // Use [\s\S] in place of . so multi-line matches work.
676 // Because JavaScript has no s (dotall) regex flag.
677 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
678 spans[i].innerHTML =
679 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
680 "' title='View footnote' class='footnote'>" + n + "</a>]";
681 spans[i].setAttribute("data-note", note);
682 }
683 noteholder.innerHTML +=
684 "<div class='footnote' id='_footnote_" + n + "'>" +
685 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
686 n + "</a>. " + note + "</div>";
687 var id =spans[i].getAttribute("id");
688 if (id != null) refs["#"+id] = n;
689 }
690 }
691 if (n == 0)
692 noteholder.parentNode.removeChild(noteholder);
693 else {
694 // Process footnoterefs.
695 for (i=0; i<spans.length; i++) {
696 if (spans[i].className == "footnoteref") {
697 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
698 href = href.match(/#.*/)[0]; // Because IE return full URL.
699 n = refs[href];
700 spans[i].innerHTML =
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n + "</a>]";
703 }
704 }
705 }
706},
707
708install: function(toclevels) {
709 var timerId;
710
711 function reinstall() {
712 asciidoc.footnotes();
713 if (toclevels) {
714 asciidoc.toc(toclevels);
715 }
716 }
717
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
720 reinstall();
721 }
722
723 timerId = setInterval(reinstall, 500);
724 if (document.addEventListener)
725 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
726 else
727 window.onload = reinstallAndRemoveTimer;
728}
729
730}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]731asciidoc.install();
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]732/*]]>*/
733</script>
734</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]735<body class="article">
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]736<div id="header">
737<h1>How to rebase from an internal branch</h1>
Junio C Hamanod37473e2023-05-15 23:04:43[diff] [blame^]738<span id="revdate">2023-05-15</span>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]739</div>
740<div id="content">
741<div id="preamble">
742<div class="sectionbody">
743<div class="listingblock">
744<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]745<pre><code>Petr Baudis &lt;pasky@suse.cz&gt; writes:
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]746
747&gt; Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter
748&gt; where Junio C Hamano &lt;junkio@cox.net&gt; told me that...
749&gt;&gt; Linus Torvalds &lt;torvalds@osdl.org&gt; writes:
750&gt;&gt;
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]751&gt;&gt; &gt; Junio, maybe you want to talk about how you move patches from your
752&gt;&gt; &gt; "seen" branch to the real branches.
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]753&gt;&gt;
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]754&gt; Actually, wouldn't this be also precisely for what StGIT is intended to?</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]755</div></div>
756<div class="paragraph"><p>Exactly my feeling. I was sort of waiting for Catalin to speak
757up. With its basing philosophical ancestry on quilt, this is
758the kind of task StGIT is designed to do.</p></div>
759<div class="paragraph"><p>I just have done a simpler one, this time using only the core
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]760Git tools.</p></div>
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]761<div class="paragraph"><p>I had a handful of commits that were ahead of master in <em>seen</em>, and I
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]762wanted to add some documentation bypassing my usual habit of
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]763placing new things in <em>seen</em> first. At the beginning, the commit
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]764ancestry graph looked like this:</p></div>
765<div class="literalblock">
766<div class="content">
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]767<pre><code> *"seen" head
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]768master --&gt; #1 --&gt; #2 --&gt; #3</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]769</div></div>
770<div class="paragraph"><p>So I started from master, made a bunch of edits, and committed:</p></div>
771<div class="literalblock">
772<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]773<pre><code>$ git checkout master
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]774$ cd Documentation; ed git.txt ...
775$ cd ..; git add Documentation/*.txt
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]776$ git commit -s</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]777</div></div>
778<div class="paragraph"><p>After the commit, the ancestry graph would look like this:</p></div>
779<div class="literalblock">
780<div class="content">
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]781<pre><code> *"seen" head
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]782master^ --&gt; #1 --&gt; #2 --&gt; #3
783 \
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]784 \---&gt; master</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]785</div></div>
786<div class="paragraph"><p>The old master is now master^ (the first parent of the master).
787The new master commit holds my documentation updates.</p></div>
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]788<div class="paragraph"><p>Now I have to deal with "seen" branch.</p></div>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]789<div class="paragraph"><p>This is the kind of situation I used to have all the time when
790Linus was the maintainer and I was a contributor, when you look
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]791at "master" branch being the "maintainer" branch, and "seen"
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]792branch being the "contributor" branch. Your work started at the
793tip of the "maintainer" branch some time ago, you made a lot of
794progress in the meantime, and now the maintainer branch has some
795other commits you do not have yet. And "git rebase" was written
796with the explicit purpose of helping to maintain branches like
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]797"seen". You <em>could</em> merge master to <em>seen</em> and keep going, but if you
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]798eventually want to cherrypick and merge some but not necessarily
799all changes back to the master branch, it often makes later
800operations for <em>you</em> easier if you rebase (i.e. carry forward
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]801your changes) "seen" rather than merge. So I ran "git rebase":</p></div>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]802<div class="literalblock">
803<div class="content">
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]804<pre><code>$ git checkout seen
805$ git rebase master seen</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]806</div></div>
807<div class="paragraph"><p>What this does is to pick all the commits since the current
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]808branch (note that I now am on "seen" branch) forked from the
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]809master branch, and forward port these changes.</p></div>
810<div class="literalblock">
811<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]812<pre><code>master^ --&gt; #1 --&gt; #2 --&gt; #3
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]813 \ *"seen" head
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]814 \---&gt; master --&gt; #1' --&gt; #2' --&gt; #3'</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]815</div></div>
816<div class="paragraph"><p>The diff between master^ and #1 is applied to master and
817committed to create #1' commit with the commit information (log,
818author and date) taken from commit #1. On top of that #2' and #3'
819commits are made similarly out of #2 and #3 commits.</p></div>
820<div class="paragraph"><p>Old #3 is not recorded in any of the .git/refs/heads/ file
821anymore, so after doing this you will have dangling commit if
Junio C Hamanoa8911782020-07-07 05:35:57[diff] [blame]822you ran fsck-cache, which is normal. After testing "seen", you
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]823can run "git prune" to get rid of those original three commits.</p></div>
824<div class="paragraph"><p>While I am talking about "git rebase", I should talk about how
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]825to do cherrypicking using only the core Git tools.</p></div>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]826<div class="paragraph"><p>Let&#8217;s go back to the earlier picture, with different labels.</p></div>
827<div class="paragraph"><p>You, as an individual developer, cloned upstream repository and
828made a couple of commits on top of it.</p></div>
829<div class="literalblock">
830<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]831<pre><code> *your "master" head
832upstream --&gt; #1 --&gt; #2 --&gt; #3</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]833</div></div>
834<div class="paragraph"><p>You would want changes #2 and #3 incorporated in the upstream,
835while you feel that #1 may need further improvements. So you
836prepare #2 and #3 for e-mail submission.</p></div>
837<div class="literalblock">
838<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]839<pre><code>$ git format-patch master^^ master</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]840</div></div>
841<div class="paragraph"><p>This creates two files, 0001-XXXX.patch and 0002-XXXX.patch. Send
842them out "To: " your project maintainer and "Cc: " your mailing
843list. You could use contributed script git-send-email if
844your host has necessary perl modules for this, but your usual
845MUA would do as long as it does not corrupt whitespaces in the
846patch.</p></div>
847<div class="paragraph"><p>Then you would wait, and you find out that the upstream picked
848up your changes, along with other changes.</p></div>
849<div class="literalblock">
850<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]851<pre><code> where *your "master" head
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]852upstream --&gt; #1 --&gt; #2 --&gt; #3
853 used \
854 to be \--&gt; #A --&gt; #2' --&gt; #3' --&gt; #B --&gt; #C
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]855 *upstream head</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]856</div></div>
857<div class="paragraph"><p>The two commits #2' and #3' in the above picture record the same
858changes your e-mail submission for #2 and #3 contained, but
859probably with the new sign-off line added by the upstream
860maintainer and definitely with different committer and ancestry
861information, they are different objects from #2 and #3 commits.</p></div>
862<div class="paragraph"><p>You fetch from upstream, but not merge.</p></div>
863<div class="literalblock">
864<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]865<pre><code>$ git fetch upstream</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]866</div></div>
867<div class="paragraph"><p>This leaves the updated upstream head in .git/FETCH_HEAD but
Junio C Hamanod75148a2014-04-08 19:48:38[diff] [blame]868does not touch your .git/HEAD or .git/refs/heads/master.
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]869You run "git rebase" now.</p></div>
870<div class="literalblock">
871<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]872<pre><code>$ git rebase FETCH_HEAD master</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]873</div></div>
874<div class="paragraph"><p>Earlier, I said that rebase applies all the commits from your
875branch on top of the upstream head. Well, I lied. "git rebase"
876is a bit smarter than that and notices that #2 and #3 need not
877be applied, so it only applies #1. The commit ancestry graph
878becomes something like this:</p></div>
879<div class="literalblock">
880<div class="content">
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]881<pre><code> where *your old "master" head
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]882upstream --&gt; #1 --&gt; #2 --&gt; #3
883 used \ your new "master" head*
884 to be \--&gt; #A --&gt; #2' --&gt; #3' --&gt; #B --&gt; #C --&gt; #1'
885 *upstream
Junio C Hamanoc14e6ad2014-10-31 20:25:53[diff] [blame]886 head</code></pre>
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]887</div></div>
888<div class="paragraph"><p>Again, "git prune" would discard the disused commits #1-#3 and
889you continue on starting from the new "master" head, which is
890the #1' commit.</p></div>
891<div class="paragraph"><p>-jc</p></div>
892</div>
893</div>
894</div>
895<div id="footnotes"><hr /></div>
896<div id="footer">
897<div id="footer-text">
Junio C Hamano2ef0ba32018-01-26 23:13:53[diff] [blame]898Last updated
Junio C Hamanod37473e2023-05-15 23:04:43[diff] [blame^]899 2023-05-15 16:02:11 PDT
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame]900</div>
901</div>
902</body>
903</html>