Google Git
Sign in
chromium / external / gitster / git-htmldocs / f2b7494f8bfdb746bbedce9cf8095db7164f92b0 / . / howto / revert-branch-rebase.html
blob: 2cf18272fc8b5a8525712a0f168959eadfa6ec0f [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 Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame^]7<title>How to revert an existing commit</title>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]30 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]35 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]50h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]90 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]91}
92span#email {
93}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]180 text-align: right;
181}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]182
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]256
257div.tableblock > table {
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]285
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]293}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]298 vertical-align: top;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]302}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]376/* Workarounds for IE6's broken and incomplete CSS2. */
377
378div.sidebar-content {
379 background: #ffffee;
380 border: 1px solid silver;
381 padding: 0.5em;
382}
383div.sidebar-title, div.image-title {
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]384 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]385 font-family: sans-serif;
386 font-weight: bold;
387 margin-top: 0.0em;
388 margin-bottom: 0.5em;
389}
390
391div.listingblock div.content {
392 border: 1px solid silver;
393 background: #f4f4f4;
394 padding: 0.5em;
395}
396
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]397div.quoteblock-attribution {
398 padding-top: 0.5em;
399 text-align: right;
400}
401
402div.verseblock-content {
403 white-space: pre;
404}
405div.verseblock-attribution {
406 padding-top: 0.75em;
407 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]408}
409
410div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]411 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]412 padding-left: 0.5em;
413}
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]414
415/* IE6 sets dynamically generated links as visited. */
416div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]417</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]418<script type="text/javascript">
419/*<![CDATA[*/
420window.onload = function(){asciidoc.footnotes();}
421var asciidoc = { // Namespace.
422
423/////////////////////////////////////////////////////////////////////
424// Table Of Contents generator
425/////////////////////////////////////////////////////////////////////
426
427/* Author: Mihai Bazon, September 2002
428 * http://students.infoiasi.ro/~mishoo
429 *
430 * Table Of Content generator
431 * Version: 0.4
432 *
433 * Feel free to use this script under the terms of the GNU General Public
434 * License, as long as you do not remove or alter this notice.
435 */
436
437 /* modified by Troy D. Hanson, September 2006. License: GPL */
438 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
439
440// toclevels = 1..4.
441toc: function (toclevels) {
442
443 function getText(el) {
444 var text = "";
445 for (var i = el.firstChild; i != null; i = i.nextSibling) {
446 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
447 text += i.data;
448 else if (i.firstChild != null)
449 text += getText(i);
450 }
451 return text;
452 }
453
454 function TocEntry(el, text, toclevel) {
455 this.element = el;
456 this.text = text;
457 this.toclevel = toclevel;
458 }
459
460 function tocEntries(el, toclevels) {
461 var result = new Array;
462 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
463 // Function that scans the DOM tree for header elements (the DOM2
464 // nodeIterator API would be a better technique but not supported by all
465 // browsers).
466 var iterate = function (el) {
467 for (var i = el.firstChild; i != null; i = i.nextSibling) {
468 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
469 var mo = re.exec(i.tagName);
470 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
471 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
472 }
473 iterate(i);
474 }
475 }
476 }
477 iterate(el);
478 return result;
479 }
480
481 var toc = document.getElementById("toc");
482 var entries = tocEntries(document.getElementById("content"), toclevels);
483 for (var i = 0; i < entries.length; ++i) {
484 var entry = entries[i];
485 if (entry.element.id == "")
486 entry.element.id = "_toc_" + i;
487 var a = document.createElement("a");
488 a.href = "#" + entry.element.id;
489 a.appendChild(document.createTextNode(entry.text));
490 var div = document.createElement("div");
491 div.appendChild(a);
492 div.className = "toclevel" + entry.toclevel;
493 toc.appendChild(div);
494 }
495 if (entries.length == 0)
496 toc.parentNode.removeChild(toc);
497},
498
499
500/////////////////////////////////////////////////////////////////////
501// Footnotes generator
502/////////////////////////////////////////////////////////////////////
503
504/* Based on footnote generation code from:
505 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
506 */
507
508footnotes: function () {
509 var cont = document.getElementById("content");
510 var noteholder = document.getElementById("footnotes");
511 var spans = cont.getElementsByTagName("span");
512 var refs = {};
513 var n = 0;
514 for (i=0; i<spans.length; i++) {
515 if (spans[i].className == "footnote") {
516 n++;
517 // Use [\s\S] in place of . so multi-line matches work.
518 // Because JavaScript has no s (dotall) regex flag.
519 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
520 noteholder.innerHTML +=
521 "<div class='footnote' id='_footnote_" + n + "'>" +
522 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
523 n + "</a>. " + note + "</div>";
524 spans[i].innerHTML =
525 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
526 "' title='View footnote' class='footnote'>" + n + "</a>]";
527 var id =spans[i].getAttribute("id");
528 if (id != null) refs["#"+id] = n;
529 }
530 }
531 if (n == 0)
532 noteholder.parentNode.removeChild(noteholder);
533 else {
534 // Process footnoterefs.
535 for (i=0; i<spans.length; i++) {
536 if (spans[i].className == "footnoteref") {
537 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
538 href = href.match(/#.*/)[0]; // Because IE return full URL.
539 n = refs[href];
540 spans[i].innerHTML =
541 "[<a href='#_footnote_" + n +
542 "' title='View footnote' class='footnote'>" + n + "</a>]";
543 }
544 }
545 }
546}
547
548}
549/*]]>*/
550</script>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]551</head>
552<body>
553<div id="header">
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame^]554<h1>How to revert an existing commit</h1>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]555</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]556<div id="content">
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]557<div id="preamble">
558<div class="sectionbody">
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]559<div class="paragraph"><p>One of the changes I pulled into the <em>master</em> branch turns out to
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]560break building GIT with GCC 2.95. While they were well intentioned
561portability fixes, keeping things working with gcc-2.95 was also
562important. Here is what I did to revert the change in the <em>master</em>
563branch and to adjust the <em>pu</em> branch, using core GIT tools and
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]564barebone Porcelain.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]565<div class="paragraph"><p>First, prepare a throw-away branch in case I screw things up.</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]566<div class="listingblock">
567<div class="content">
568<pre><tt>$ git checkout -b revert-c99 master</tt></pre>
569</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]570<div class="paragraph"><p>Now I am on the <em>revert-c99</em> branch. Let&#8217;s figure out which commit to
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]571revert. I happen to know that the top of the <em>master</em> branch is a
572merge, and its second parent (i.e. foreign commit I merged from) has
573the change I would want to undo. Further I happen to know that that
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]574merge introduced 5 commits or so:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]575<div class="listingblock">
576<div class="content">
577<pre><tt>$ git show-branch --more=4 master master^2 | head
578* [master] Merge refs/heads/portable from http://www.cs.berkeley....
579 ! [master^2] Replace C99 array initializers with code.
580--
581- [master] Merge refs/heads/portable from http://www.cs.berkeley....
582*+ [master^2] Replace C99 array initializers with code.
583*+ [master^2~1] Replace unsetenv() and setenv() with older putenv().
584*+ [master^2~2] Include sys/time.h in daemon.c.
585*+ [master^2~3] Fix ?: statements.
586*+ [master^2~4] Replace zero-length array decls with [].
587* [master~1] tutorial note about git branch</tt></pre>
588</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]589<div class="paragraph"><p>The <em>--more=4</em> above means "after we reach the merge base of refs,
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]590show until we display four more common commits". That last commit
591would have been where the "portable" branch was forked from the main
592git.git repository, so this would show everything on both branches
593since then. I just limited the output to the first handful using
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]594<em>head</em>.</p></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]595<div class="paragraph"><p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]596the <em>master</em>, and then go four generations back following the first
597parent") is the one I would want to revert. Since I also want to say
598why I am reverting it, the <em>-n</em> flag is given to <em>git revert</em>. This
599prevents it from actually making a commit, and instead <em>git revert</em>
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]600leaves the commit log message it wanted to use in <em>.msg</em> file:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]601<div class="listingblock">
602<div class="content">
603<pre><tt>$ git revert -n master^2~4
604$ cat .msg
605Revert "Replace zero-length array decls with []."
606
607This reverts 6c5f9baa3bc0d63e141e0afc23110205379905a4 commit.
608$ git diff HEAD ;# to make sure what we are reverting makes sense.
609$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
610$ make clean test ;# make sure it did not cause other breakage.</tt></pre>
611</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]612<div class="paragraph"><p>The reverted change makes sense (from reading the <em>diff</em> output), does
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]613fix the problem (from <em>make CC=gcc-2.95</em> test), and does not cause new
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]614breakage (from the last <em>make test</em>). I&#8217;m ready to commit:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]615<div class="listingblock">
616<div class="content">
617<pre><tt>$ git commit -a -s ;# read .msg into the log,
618 # and explain why I am reverting.</tt></pre>
619</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]620<div class="paragraph"><p>I could have screwed up in any of the above steps, but in the worst
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]621case I could just have done <em>git checkout master</em> to start over.
622Fortunately I did not have to; what I have in the current branch
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]623<em>revert-c99</em> is what I want. So merge that back into <em>master</em>:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]624<div class="listingblock">
625<div class="content">
626<pre><tt>$ git checkout master
Junio C Hamano3f680f32009-11-16 02:10:54[diff] [blame]627$ git merge revert-c99 ;# this should be a fast-forward
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]628Updating from 10d781b9caa4f71495c7b34963bef137216f86a8 to e3a693c...
629 cache.h | 8 ++++----
630 commit.c | 2 +-
631 ls-files.c | 2 +-
632 receive-pack.c | 2 +-
633 server-info.c | 2 +-
634 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>
635</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]636<div class="paragraph"><p>There is no need to redo the test at this point. We fast-forwarded
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]637and we know <em>master</em> matches <em>revert-c99</em> exactly. In fact:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]638<div class="listingblock">
639<div class="content">
640<pre><tt>$ git diff master..revert-c99</tt></pre>
641</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]642<div class="paragraph"><p>says nothing.</p></div>
643<div class="paragraph"><p>Then we rebase the <em>pu</em> branch as usual.</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]644<div class="listingblock">
645<div class="content">
646<pre><tt>$ git checkout pu
647$ git tag pu-anchor pu
648$ git rebase master
649* Applying: Redo "revert" using three-way merge machinery.
650First trying simple merge strategy to cherry-pick.
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]651* Applying: Remove git-apply-patch-script.
652First trying simple merge strategy to cherry-pick.
653Simple cherry-pick fails; trying Automatic cherry-pick.
654Removing Documentation/git-apply-patch-script.txt
655Removing git-apply-patch-script
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]656* Applying: Document "git cherry-pick" and "git revert"
657First trying simple merge strategy to cherry-pick.
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]658* Applying: mailinfo and applymbox updates
659First trying simple merge strategy to cherry-pick.
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]660* Applying: Show commits in topo order and name all commits.
661First trying simple merge strategy to cherry-pick.
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]662* Applying: More documentation updates.
Junio C Hamano075ae872010-09-01 18:43:07[diff] [blame]663First trying simple merge strategy to cherry-pick.</tt></pre>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]664</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]665<div class="paragraph"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]666rebase</em> screws up. After this, I can do these for sanity check:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]667<div class="listingblock">
668<div class="content">
669<pre><tt>$ git diff pu-anchor..pu ;# make sure we got the master fix.
670$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
671$ make clean test ;# make sure it did not cause other breakage.</tt></pre>
672</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]673<div class="paragraph"><p>Everything is in the good order. I do not need the temporary branch
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]674nor tag anymore, so remove them:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]675<div class="listingblock">
676<div class="content">
677<pre><tt>$ rm -f .git/refs/tags/pu-anchor
678$ git branch -d revert-c99</tt></pre>
679</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]680<div class="paragraph"><p>It was an emergency fix, so we might as well merge it into the
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]681<em>release candidate</em> branch, although I expect the next release would
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]682be some days off:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]683<div class="listingblock">
684<div class="content">
685<pre><tt>$ git checkout rc
686$ git pull . master
687Packing 0 objects
688Unpacking 0 objects
689
690* committish: e3a693c... refs/heads/master from .
691Trying to merge e3a693c... into 8c1f5f0... using 10d781b...
692Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
693 cache.h | 8 ++++----
694 commit.c | 2 +-
695 ls-files.c | 2 +-
696 receive-pack.c | 2 +-
697 server-info.c | 2 +-
698 5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>
699</div></div>
Junio C Hamano103b5722011-01-31 05:03:45[diff] [blame]700<div class="paragraph"><p>And the final repository status looks like this:</p></div>
Junio C Hamanod97409f2006-10-03 08:41:56[diff] [blame]701<div class="listingblock">
702<div class="content">
703<pre><tt>$ git show-branch --more=1 master pu rc
704! [master] Revert "Replace zero-length array decls with []."
705 ! [pu] git-repack: Add option to repack all objects.
706 * [rc] Merge refs/heads/master from .
707---
708 + [pu] git-repack: Add option to repack all objects.
709 + [pu~1] More documentation updates.
710 + [pu~2] Show commits in topo order and name all commits.
711 + [pu~3] mailinfo and applymbox updates
712 + [pu~4] Document "git cherry-pick" and "git revert"
713 + [pu~5] Remove git-apply-patch-script.
714 + [pu~6] Redo "revert" using three-way merge machinery.
715 - [rc] Merge refs/heads/master from .
716++* [master] Revert "Replace zero-length array decls with []."
717 - [rc~1] Merge refs/heads/master from .
718... [master~1] Merge refs/heads/portable from http://www.cs.berkeley....</tt></pre>
719</div></div>
720</div>
721</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]722</div>
723<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]724<div id="footer">
725<div id="footer-text">
Junio C Hamanof2b74942012-11-20 21:06:26[diff] [blame^]726Last updated 2012-11-20 13:06:05 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23[diff] [blame]727</div>
728</div>
729</body>
730</html>