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