blob: 842cfa289517667cb98928c7ce57a55bf393915d [file] [log] [blame]
Junio C Hamano944ce252018-05-30 22:25:261<?xml version="1.0" encoding="UTF-8"?>
Junio C Hamano1a4e8412005-12-27 08:17:232<!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:116<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
Junio C Hamanoa85030a2022-07-27 16:48:217<meta name="generator" content="AsciiDoc 10.2.0" />
Junio C Hamano68cf15a2010-11-06 01:01:598<title>git-revert(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:239<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:1110/* 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 Hamano1a4e8412005-12-27 08:17:2325}
26
27body {
28 margin: 1em 5% 1em 5%;
29}
30
Junio C Hamanoba4b9282008-07-06 05:20:3131a {
32 color: blue;
33 text-decoration: underline;
34}
35a:visited {
36 color: fuchsia;
37}
Junio C Hamano1a4e8412005-12-27 08:17:2338
39em {
40 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:5941 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2342}
43
44strong {
45 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:5946 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:2347}
48
Junio C Hamano1a4e8412005-12-27 08:17:2349h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:2351 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
54}
55
Junio C Hamanoba4b9282008-07-06 05:20:3156h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:2357 border-bottom: 2px solid silver;
58}
59h2 {
Junio C Hamano1a4e8412005-12-27 08:17:2360 padding-top: 0.5em;
61}
Junio C Hamanoba4b9282008-07-06 05:20:3162h3 {
63 float: left;
64}
65h3 + * {
66 clear: left;
67}
Junio C Hamano9d971152012-12-19 00:43:1168h5 {
69 font-size: 1.0em;
70}
Junio C Hamano1a4e8412005-12-27 08:17:2371
72div.sectionbody {
Junio C Hamano1a4e8412005-12-27 08:17:2373 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
Junio C Hamano68cf15a2010-11-06 01:01:5985ul, ol, li > p {
86 margin-top: 0;
87}
Junio C Hamano9d971152012-12-19 00:43:1188ul > li { color: #aaa; }
89ul > li > * { color: black; }
Junio C Hamano68cf15a2010-11-06 01:01:5990
Junio C Hamanoc14e6ad2014-10-31 20:25:5391.monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2395 padding: 0;
96 margin: 0;
97}
Junio C Hamanoc14e6ad2014-10-31 20:25:5398pre {
99 white-space: pre-wrap;
100}
Junio C Hamano1a4e8412005-12-27 08:17:23101
Junio C Hamano9d971152012-12-19 00:43:11102#author {
Junio C Hamano1a4e8412005-12-27 08:17:23103 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23104 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31105 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23106}
Junio C Hamano9d971152012-12-19 00:43:11107#email {
Junio C Hamano1a4e8412005-12-27 08:17:23108}
Junio C Hamano9d971152012-12-19 00:43:11109#revnumber, #revdate, #revremark {
Junio C Hamano1a4e8412005-12-27 08:17:23110}
111
Junio C Hamano9d971152012-12-19 00:43:11112#footer {
Junio C Hamano1a4e8412005-12-27 08:17:23113 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:11118#footer-text {
Junio C Hamano1a4e8412005-12-27 08:17:23119 float: left;
120 padding-bottom: 0.5em;
121}
Junio C Hamano9d971152012-12-19 00:43:11122#footer-badges {
Junio C Hamano1a4e8412005-12-27 08:17:23123 float: right;
124 padding-bottom: 0.5em;
125}
126
Junio C Hamano9d971152012-12-19 00:43:11127#preamble {
Junio C Hamano68cf15a2010-11-06 01:01:59128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
130}
Junio C Hamano9d971152012-12-19 00:43:11131div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano1a4e8412005-12-27 08:17:23132div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22134 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23135 margin-bottom: 1.5em;
136}
137div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23142}
143
144div.content { /* Block element content. */
145 padding: 0;
146}
147
148/* Block element titles. */
149div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59150 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23151 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:11172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
Junio C Hamano1a4e8412005-12-27 08:17:23174 padding: 0.5em;
175}
176
177div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
Junio C Hamano1a4e8412005-12-27 08:17:23181 padding: 0.5em;
182}
183
Junio C Hamano7bd050f2011-09-22 06:32:22184div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59187 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11188 border-left: 5px solid #f0f0f0;
189 color: #888;
Junio C Hamano1a4e8412005-12-27 08:17:23190}
Junio C Hamano7bd050f2011-09-22 06:32:22191
Junio C Hamano68cf15a2010-11-06 01:01:59192div.quoteblock > div.attribution {
193 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23194 text-align: right;
195}
Junio C Hamano68cf15a2010-11-06 01:01:59196
Junio C Hamano9d971152012-12-19 00:43:11197div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
Junio C Hamano68cf15a2010-11-06 01:01:59200}
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. */
Junio C Hamanoba4b9282008-07-06 05:20:31206div.verseblock + div.attribution {
207 text-align: left;
208}
Junio C Hamano1a4e8412005-12-27 08:17:23209
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;
Junio C Hamano7bd050f2011-09-22 06:32:22220 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23221}
222
223div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23226}
227
Junio C Hamano1a4e8412005-12-27 08:17:23228div.imageblock div.content { padding-left: 0; }
Junio C Hamanoc14e6ad2014-10-31 20:25:53229span.image img { border-style: none; vertical-align: text-bottom; }
Junio C Hamano68cf15a2010-11-06 01:01:59230a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23231
232dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
235}
236dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59239 font-style: normal;
240 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23241}
242dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59243 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23244}
245
246ul, ol {
247 list-style-position: outside;
248}
Junio C Hamano68cf15a2010-11-06 01:01:59249ol.arabic {
250 list-style-type: decimal;
251}
252ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23253 list-style-type: lower-alpha;
254}
Junio C Hamano68cf15a2010-11-06 01:01:59255ol.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}
Junio C Hamano1a4e8412005-12-27 08:17:23271
Junio C Hamano1a4e8412005-12-27 08:17:23272tfoot {
273 font-weight: bold;
274}
Junio C Hamano68cf15a2010-11-06 01:01:59275td > div.verse {
276 white-space: pre;
277}
Junio C Hamano68cf15a2010-11-06 01:01:59278
279div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
282}
Junio C Hamano68cf15a2010-11-06 01:01:59283div.hdlist tr {
284 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31285}
Junio C Hamano68cf15a2010-11-06 01:01:59286dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
288}
289td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23290 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59291 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23292 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59293 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23294}
Junio C Hamano68cf15a2010-11-06 01:01:59295td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23296 vertical-align: top;
297}
Junio C Hamano68cf15a2010-11-06 01:01:59298div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
301}
302
303.comment {
304 background: yellow;
305}
Junio C Hamano1a4e8412005-12-27 08:17:23306
Junio C Hamano7bd050f2011-09-22 06:32:22307.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:11334div.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 Hamano1a4e8412005-12-27 08:17:23341}
Junio C Hamanoba4b9282008-07-06 05:20:31342
Junio C Hamano9d971152012-12-19 00:43:11343@media print {
344 #footer-badges { display: none; }
345}
346
347#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22348 margin-bottom: 2.5em;
349}
350
Junio C Hamano9d971152012-12-19 00:43:11351#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31352 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31353 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:53359div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31360 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 Hamano9d971152012-12-19 00:43:11375
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:53417div.unbreakable { page-break-inside: avoid; }
418
Junio C Hamano9d971152012-12-19 00:43:11419
420/*
421 * xhtml11 specific
422 *
423 * */
424
425div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
428}
429div.tableblock > table {
430 border: 3px solid #527bbd;
431}
432thead, p.table.header {
433 font-weight: bold;
434 color: #527bbd;
435}
436p.table {
437 margin-top: 0;
438}
Junio C Hamano725b0da2020-01-22 22:02:40439/* Because the table frame attribute is overridden by CSS in most browsers. */
Junio C Hamano9d971152012-12-19 00:43:11440div.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;
450}
451
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;
481}
482
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 {
502 text-align: right;
503}
504
505th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
507}
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;
513}
514
515
516/*
517 * manpage specific
518 *
519 * */
520
521body.manpage h1 {
Junio C Hamano68cf15a2010-11-06 01:01:59522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
526}
Junio C Hamano9d971152012-12-19 00:43:11527body.manpage h2 {
Junio C Hamano68cf15a2010-11-06 01:01:59528 border-style: none;
529}
Junio C Hamano9d971152012-12-19 00:43:11530body.manpage div.sectionbody {
531 margin-left: 3em;
Junio C Hamano68cf15a2010-11-06 01:01:59532}
533
534@media print {
Junio C Hamano9d971152012-12-19 00:43:11535 body.manpage div#toc { display: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59536}
Junio C Hamanoc14e6ad2014-10-31 20:25:53537
538
Junio C Hamano1a4e8412005-12-27 08:17:23539</style>
Junio C Hamano7bd050f2011-09-22 06:32:22540<script type="text/javascript">
541/*<![CDATA[*/
Junio C Hamano2b153182021-12-15 21:00:31542var 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:11731asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22732/*]]>*/
733</script>
Junio C Hamano1a4e8412005-12-27 08:17:23734</head>
Junio C Hamano9d971152012-12-19 00:43:11735<body class="manpage">
Junio C Hamano1a4e8412005-12-27 08:17:23736<div id="header">
737<h1>
738git-revert(1) Manual Page
739</h1>
740<h2>NAME</h2>
741<div class="sectionbody">
742<p>git-revert -
Junio C Hamano89a57342010-06-22 23:22:55743 Revert some existing commits
Junio C Hamano1a4e8412005-12-27 08:17:23744</p>
745</div>
746</div>
Junio C Hamano7bd050f2011-09-22 06:32:22747<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11748<div class="sect1">
Junio C Hamano68cf15a2010-11-06 01:01:59749<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23750<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59751<div class="verseblock">
Junio C Hamanod2432642022-11-29 04:27:23752<pre class="content"><em>git revert</em> [--[no-]edit] [-n] [-m &lt;parent-number&gt;] [-s] [-S[&lt;keyid&gt;]] &lt;commit&gt;&#8230;
Junio C Hamanoa42e0332019-07-19 19:49:37753<em>git revert</em> (--continue | --skip | --abort | --quit)</pre>
Junio C Hamano9d971152012-12-19 00:43:11754<div class="attribution">
Junio C Hamano15567bc2011-07-23 00:51:59755</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23756</div>
Junio C Hamano9d971152012-12-19 00:43:11757</div>
758<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31759<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23760<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59761<div class="paragraph"><p>Given one or more existing commits, revert the changes that the
Junio C Hamano89a57342010-06-22 23:22:55762related patches introduce, and record some new commits that record
763them. This requires your working tree to be clean (no modifications
764from the HEAD commit).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59765<div class="paragraph"><p>Note: <em>git revert</em> is used to record some new commits to reverse the
Junio C Hamano89a57342010-06-22 23:22:55766effect of some earlier commits (often only a faulty one). If you want to
Junio C Hamano3580ad22008-08-21 00:27:40767throw away all uncommitted changes in your working directory, you
Junio C Hamano92d80372016-07-13 22:00:05768should see <a href="git-reset.html">git-reset(1)</a>, particularly the <code>--hard</code> option. If
Junio C Hamano3580ad22008-08-21 00:27:40769you want to extract specific files as they were in another commit, you
Junio C Hamanoc9f11c22019-07-10 02:54:04770should see <a href="git-restore.html">git-restore(1)</a>, specifically the <code>--source</code>
771option. Take care with these alternatives as
Junio C Hamano3580ad22008-08-21 00:27:40772both will discard uncommitted changes in your working directory.</p></div>
Junio C Hamanoc9f11c22019-07-10 02:54:04773<div class="paragraph"><p>See "Reset, restore and revert" in <a href="git.html">git(1)</a> for the differences
774between the three commands.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23775</div>
Junio C Hamano9d971152012-12-19 00:43:11776</div>
777<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31778<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23779<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59780<div class="dlist"><dl>
781<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55782&lt;commit&gt;&#8230;
Junio C Hamano1a4e8412005-12-27 08:17:23783</dt>
784<dd>
785<p>
Junio C Hamano89a57342010-06-22 23:22:55786 Commits to revert.
Junio C Hamano2d47c622007-01-18 06:24:10787 For a more complete list of ways to spell commit names, see
Junio C Hamanoa28a9202012-06-21 07:08:23788 <a href="gitrevisions.html">gitrevisions(7)</a>.
Junio C Hamano89a57342010-06-22 23:22:55789 Sets of commits can also be given but no traversal is done by
Junio C Hamano92d80372016-07-13 22:00:05790 default, see <a href="git-rev-list.html">git-rev-list(1)</a> and its <code>--no-walk</code>
Junio C Hamano89a57342010-06-22 23:22:55791 option.
Junio C Hamano1a4e8412005-12-27 08:17:23792</p>
793</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59794<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47795-e
796</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59797<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47798--edit
Junio C Hamano1a4e8412005-12-27 08:17:23799</dt>
800<dd>
801<p>
Junio C Hamano1aa40d22010-01-21 17:46:43802 With this option, <em>git revert</em> will let you edit the commit
Junio C Hamano0e661132008-01-21 02:37:44803 message prior to committing the revert. This is the default if
Junio C Hamano1a4e8412005-12-27 08:17:23804 you run the command from a terminal.
805</p>
806</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59807<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47808-m parent-number
809</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59810<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47811--mainline parent-number
Junio C Hamanod814b6d2007-11-04 11:13:49812</dt>
813<dd>
814<p>
815 Usually you cannot revert a merge because you do not know which
816 side of the merge should be considered the mainline. This
817 option specifies the parent number (starting from 1) of
818 the mainline and allows revert to reverse the change
819 relative to the specified parent.
820</p>
Junio C Hamano68cf15a2010-11-06 01:01:59821<div class="paragraph"><p>Reverting a merge commit declares that you will never want the tree changes
Junio C Hamanof1231492008-12-22 08:27:21822brought in by the merge. As a result, later merges will only bring in tree
823changes introduced by commits that are not ancestors of the previously
824reverted merge. This may or may not be what you want.</p></div>
Junio C Hamanoe6f28d02013-09-17 21:34:00825<div class="paragraph"><p>See the <a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for
Junio C Hamanof1231492008-12-22 08:27:21826more details.</p></div>
Junio C Hamanod814b6d2007-11-04 11:13:49827</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59828<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23829--no-edit
830</dt>
831<dd>
832<p>
Junio C Hamano1aa40d22010-01-21 17:46:43833 With this option, <em>git revert</em> will not start the commit
Junio C Hamano1a4e8412005-12-27 08:17:23834 message editor.
835</p>
836</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59837<dt class="hdlist1">
Junio C Hamanod1063b12019-05-08 17:18:07838--cleanup=&lt;mode&gt;
839</dt>
840<dd>
841<p>
842 This option determines how the commit message will be cleaned up before
843 being passed on to the commit machinery. See <a href="git-commit.html">git-commit(1)</a> for more
844 details. In particular, if the <em>&lt;mode&gt;</em> is given a value of <code>scissors</code>,
845 scissors will be appended to <code>MERGE_MSG</code> before being passed on in the case
846 of a conflict.
847</p>
848</dd>
849<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47850-n
851</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59852<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47853--no-commit
Junio C Hamano1a4e8412005-12-27 08:17:23854</dt>
855<dd>
856<p>
Junio C Hamano89a57342010-06-22 23:22:55857 Usually the command automatically creates some commits with
858 commit log messages stating which commits were
859 reverted. This flag applies the changes necessary
860 to revert the named commits to your working tree
861 and the index, but does not make the commits. In addition,
Junio C Hamanof69a0a02008-07-17 08:08:47862 when this option is used, your index does not have to match
863 the HEAD commit. The revert is done against the
864 beginning state of your index.
Junio C Hamano1a4e8412005-12-27 08:17:23865</p>
Junio C Hamano68cf15a2010-11-06 01:01:59866<div class="paragraph"><p>This is useful when reverting more than one commits'
Junio C Hamanof69a0a02008-07-17 08:08:47867effect to your index in a row.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23868</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59869<dt class="hdlist1">
Junio C Hamano1eb56092015-10-05 20:39:53870-S[&lt;keyid&gt;]
Junio C Hamano5b3533d2014-02-27 23:07:15871</dt>
872<dt class="hdlist1">
Junio C Hamano1eb56092015-10-05 20:39:53873--gpg-sign[=&lt;keyid&gt;]
Junio C Hamano5b3533d2014-02-27 23:07:15874</dt>
Junio C Hamano67bf2242020-04-22 21:41:44875<dt class="hdlist1">
876--no-gpg-sign
877</dt>
Junio C Hamano5b3533d2014-02-27 23:07:15878<dd>
879<p>
Junio C Hamano1eb56092015-10-05 20:39:53880 GPG-sign commits. The <code>keyid</code> argument is optional and
881 defaults to the committer identity; if specified, it must be
Junio C Hamano67bf2242020-04-22 21:41:44882 stuck to the option without a space. <code>--no-gpg-sign</code> is useful to
883 countermand both <code>commit.gpgSign</code> configuration variable, and
884 earlier <code>--gpg-sign</code>.
Junio C Hamano5b3533d2014-02-27 23:07:15885</p>
886</dd>
887<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47888-s
889</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59890<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47891--signoff
Junio C Hamano6d76d612008-05-09 05:46:08892</dt>
893<dd>
894<p>
Junio C Hamanodf3d3cd2020-11-02 22:05:05895 Add a <code>Signed-off-by</code> trailer at the end of the commit message.
Junio C Hamano4e6ba272016-01-20 23:23:19896 See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
Junio C Hamano6d76d612008-05-09 05:46:08897</p>
898</dd>
Junio C Hamano23e3f532011-02-10 02:05:29899<dt class="hdlist1">
900--strategy=&lt;strategy&gt;
901</dt>
902<dd>
903<p>
904 Use the given merge strategy. Should only be used once.
Junio C Hamanoa28a9202012-06-21 07:08:23905 See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
Junio C Hamano23e3f532011-02-10 02:05:29906 for details.
907</p>
908</dd>
909<dt class="hdlist1">
910-X&lt;option&gt;
911</dt>
912<dt class="hdlist1">
913--strategy-option=&lt;option&gt;
914</dt>
915<dd>
916<p>
917 Pass the merge strategy-specific option through to the
Junio C Hamanoa28a9202012-06-21 07:08:23918 merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
Junio C Hamano23e3f532011-02-10 02:05:29919</p>
920</dd>
Junio C Hamano6b7d2152019-04-16 12:51:15921<dt class="hdlist1">
922--rerere-autoupdate
923</dt>
924<dt class="hdlist1">
925--no-rerere-autoupdate
926</dt>
927<dd>
928<p>
Junio C Hamano04495a12022-08-18 21:13:08929 After the rerere mechanism reuses a recorded resolution on
930 the current conflict to update the files in the working
931 tree, allow it to also update the index with the result of
932 resolution. <code>--no-rerere-autoupdate</code> is a good way to
933 double-check what <code>rerere</code> did and catch potential
934 mismerges, before committing the result to the index with a
935 separate <code>git add</code>.
Junio C Hamano6b7d2152019-04-16 12:51:15936</p>
937</dd>
Junio C Hamanob4d46bb2022-06-17 17:59:28938<dt class="hdlist1">
939--reference
940</dt>
941<dd>
942<p>
943 Instead of starting the body of the log message with "This
944 reverts &lt;full object name of the commit being reverted&gt;.",
945 refer to the commit using "--pretty=reference" format
946 (cf. <a href="git-log.html">git-log(1)</a>). The <code>revert.reference</code>
947 configuration variable can be used to enable this option by
948 default.
949</p>
950</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31951</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23952</div>
Junio C Hamano9d971152012-12-19 00:43:11953</div>
954<div class="sect1">
Junio C Hamano8fb66e52011-10-05 20:59:51955<h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
956<div class="sectionbody">
957<div class="dlist"><dl>
958<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29959--continue
960</dt>
961<dd>
962<p>
963 Continue the operation in progress using the information in
Junio C Hamanob5513772019-04-22 03:38:39964 <code>.git/sequencer</code>. Can be used to continue after resolving
Junio C Hamanof0944d02011-11-30 20:46:29965 conflicts in a failed cherry-pick or revert.
966</p>
967</dd>
968<dt class="hdlist1">
Junio C Hamanoa42e0332019-07-19 19:49:37969--skip
970</dt>
971<dd>
972<p>
973 Skip the current commit and continue with the rest of the
974 sequence.
975</p>
976</dd>
977<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29978--quit
Junio C Hamano8fb66e52011-10-05 20:59:51979</dt>
980<dd>
981<p>
982 Forget about the current operation in progress. Can be used
983 to clear the sequencer state after a failed cherry-pick or
984 revert.
985</p>
986</dd>
987<dt class="hdlist1">
Junio C Hamanof0944d02011-11-30 20:46:29988--abort
Junio C Hamano8fb66e52011-10-05 20:59:51989</dt>
990<dd>
991<p>
Junio C Hamanof0944d02011-11-30 20:46:29992 Cancel the operation and return to the pre-sequence state.
Junio C Hamano8fb66e52011-10-05 20:59:51993</p>
994</dd>
995</dl></div>
996</div>
Junio C Hamano9d971152012-12-19 00:43:11997</div>
998<div class="sect1">
Junio C Hamano89a57342010-06-22 23:22:55999<h2 id="_examples">EXAMPLES</h2>
1000<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:591001<div class="dlist"><dl>
1002<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:531003<code>git revert HEAD~3</code>
Junio C Hamano89a57342010-06-22 23:22:551004</dt>
1005<dd>
1006<p>
1007 Revert the changes specified by the fourth last commit in HEAD
1008 and create a new commit with the reverted changes.
1009</p>
1010</dd>
Junio C Hamano68cf15a2010-11-06 01:01:591011<dt class="hdlist1">
Junio C Hamanoc14e6ad2014-10-31 20:25:531012<code>git revert -n master~5..master~2</code>
Junio C Hamano89a57342010-06-22 23:22:551013</dt>
1014<dd>
1015<p>
1016 Revert the changes done by commits from the fifth last commit
1017 in master (included) to the third last commit in master
1018 (included), but do not create any commit with the reverted
1019 changes. The revert only modifies the working tree and the
1020 index.
1021</p>
1022</dd>
1023</dl></div>
1024</div>
Junio C Hamano9d971152012-12-19 00:43:111025</div>
1026<div class="sect1">
Junio C Hamano73a9b3e2023-09-14 18:21:281027<h2 id="_discussion">DISCUSSION</h2>
1028<div class="sectionbody">
1029<div class="paragraph"><p>While git creates a basic commit message automatically, it is
1030<em>strongly</em> recommended to explain why the original commit is being
1031reverted.
1032In addition, repeatedly reverting reverts will result in increasingly
1033unwieldy subject lines, for example <em>Reapply "Reapply "&lt;original subject&gt;""</em>.
1034Please consider rewording these to be shorter and more unique.</p></div>
1035</div>
1036</div>
1037<div class="sect1">
Junio C Hamanoba8baee2022-09-14 20:25:231038<h2 id="_configuration">CONFIGURATION</h2>
1039<div class="sectionbody">
1040<div class="paragraph"><p>Everything below this line in this section is selectively included
1041from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
1042as what&#8217;s found there:</p></div>
1043<div class="dlist"><dl>
1044<dt class="hdlist1">
1045revert.reference
1046</dt>
1047<dd>
1048<p>
1049 Setting this variable to true makes <code>git revert</code> behave
1050 as if the <code>--reference</code> option is given.
1051</p>
1052</dd>
1053</dl></div>
1054</div>
1055</div>
1056<div class="sect1">
Junio C Hamano89a57342010-06-22 23:22:551057<h2 id="_see_also">SEE ALSO</h2>
1058<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231059<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a></p></div>
Junio C Hamano89a57342010-06-22 23:22:551060</div>
Junio C Hamano9d971152012-12-19 00:43:111061</div>
1062<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:311063<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:231064<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:231065<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:231066</div>
Junio C Hamano7bd050f2011-09-22 06:32:221067</div>
Junio C Hamano9d971152012-12-19 00:43:111068</div>
Junio C Hamano7bd050f2011-09-22 06:32:221069<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:231070<div id="footer">
1071<div id="footer-text">
Junio C Hamano2ef0ba32018-01-26 23:13:531072Last updated
Junio C Hamano918a6972023-10-29 23:44:111073 2023-09-15 03:18:26 JST
Junio C Hamano1a4e8412005-12-27 08:17:231074</div>
1075</div>
1076</body>
1077</html>