Autogenerated HTML docs for v2.42.0-45-g6807fc
[git-htmldocs.git] / git-revert.html
blob9fbabbc16296c80d00df1a580bc0f3425b15c5fb
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
3 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
5 <head>
6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
7 <meta name="generator" content="AsciiDoc 10.2.0" />
8 <title>git-revert(1)</title>
9 <style type="text/css">
10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
12 /* Default font. */
13 body {
14 font-family: Georgia,serif;
17 /* Title font. */
18 h1, h2, h3, h4, h5, h6,
19 div.title, caption.title,
20 thead, p.table.header,
21 #toctitle,
22 #author, #revnumber, #revdate, #revremark,
23 #footer {
24 font-family: Arial,Helvetica,sans-serif;
27 body {
28 margin: 1em 5% 1em 5%;
31 a {
32 color: blue;
33 text-decoration: underline;
35 a:visited {
36 color: fuchsia;
39 em {
40 font-style: italic;
41 color: navy;
44 strong {
45 font-weight: bold;
46 color: #083194;
49 h1, h2, h3, h4, h5, h6 {
50 color: #527bbd;
51 margin-top: 1.2em;
52 margin-bottom: 0.5em;
53 line-height: 1.3;
56 h1, h2, h3 {
57 border-bottom: 2px solid silver;
59 h2 {
60 padding-top: 0.5em;
62 h3 {
63 float: left;
65 h3 + * {
66 clear: left;
68 h5 {
69 font-size: 1.0em;
72 div.sectionbody {
73 margin-left: 0;
76 hr {
77 border: 1px solid silver;
80 p {
81 margin-top: 0.5em;
82 margin-bottom: 0.5em;
85 ul, ol, li > p {
86 margin-top: 0;
88 ul > li { color: #aaa; }
89 ul > li > * { color: black; }
91 .monospaced, code, pre {
92 font-family: "Courier New", Courier, monospace;
93 font-size: inherit;
94 color: navy;
95 padding: 0;
96 margin: 0;
98 pre {
99 white-space: pre-wrap;
102 #author {
103 color: #527bbd;
104 font-weight: bold;
105 font-size: 1.1em;
107 #email {
109 #revnumber, #revdate, #revremark {
112 #footer {
113 font-size: small;
114 border-top: 2px solid silver;
115 padding-top: 0.5em;
116 margin-top: 4.0em;
118 #footer-text {
119 float: left;
120 padding-bottom: 0.5em;
122 #footer-badges {
123 float: right;
124 padding-bottom: 0.5em;
127 #preamble {
128 margin-top: 1.5em;
129 margin-bottom: 1.5em;
131 div.imageblock, div.exampleblock, div.verseblock,
132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
133 div.admonitionblock {
134 margin-top: 1.0em;
135 margin-bottom: 1.5em;
137 div.admonitionblock {
138 margin-top: 2.0em;
139 margin-bottom: 2.0em;
140 margin-right: 10%;
141 color: #606060;
144 div.content { /* Block element content. */
145 padding: 0;
148 /* Block element titles. */
149 div.title, caption.title {
150 color: #527bbd;
151 font-weight: bold;
152 text-align: left;
153 margin-top: 1.0em;
154 margin-bottom: 0.5em;
156 div.title + * {
157 margin-top: 0;
160 td div.title:first-child {
161 margin-top: 0.0em;
163 div.content div.title:first-child {
164 margin-top: 0.0em;
166 div.content + div.title {
167 margin-top: 0.0em;
170 div.sidebarblock > div.content {
171 background: #ffffee;
172 border: 1px solid #dddddd;
173 border-left: 4px solid #f0f0f0;
174 padding: 0.5em;
177 div.listingblock > div.content {
178 border: 1px solid #dddddd;
179 border-left: 5px solid #f0f0f0;
180 background: #f8f8f8;
181 padding: 0.5em;
184 div.quoteblock, div.verseblock {
185 padding-left: 1.0em;
186 margin-left: 1.0em;
187 margin-right: 10%;
188 border-left: 5px solid #f0f0f0;
189 color: #888;
192 div.quoteblock > div.attribution {
193 padding-top: 0.5em;
194 text-align: right;
197 div.verseblock > pre.content {
198 font-family: inherit;
199 font-size: inherit;
201 div.verseblock > div.attribution {
202 padding-top: 0.75em;
203 text-align: left;
205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
206 div.verseblock + div.attribution {
207 text-align: left;
210 div.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;
218 div.admonitionblock td.content {
219 padding-left: 0.5em;
220 border-left: 3px solid #dddddd;
223 div.exampleblock > div.content {
224 border-left: 3px solid #dddddd;
225 padding-left: 0.5em;
228 div.imageblock div.content { padding-left: 0; }
229 span.image img { border-style: none; vertical-align: text-bottom; }
230 a.image:visited { color: white; }
232 dl {
233 margin-top: 0.8em;
234 margin-bottom: 0.8em;
236 dt {
237 margin-top: 0.5em;
238 margin-bottom: 0;
239 font-style: normal;
240 color: navy;
242 dd > *:first-child {
243 margin-top: 0.1em;
246 ul, ol {
247 list-style-position: outside;
249 ol.arabic {
250 list-style-type: decimal;
252 ol.loweralpha {
253 list-style-type: lower-alpha;
255 ol.upperalpha {
256 list-style-type: upper-alpha;
258 ol.lowerroman {
259 list-style-type: lower-roman;
261 ol.upperroman {
262 list-style-type: upper-roman;
265 div.compact ul, div.compact ol,
266 div.compact p, div.compact p,
267 div.compact div, div.compact div {
268 margin-top: 0.1em;
269 margin-bottom: 0.1em;
272 tfoot {
273 font-weight: bold;
275 td > div.verse {
276 white-space: pre;
279 div.hdlist {
280 margin-top: 0.8em;
281 margin-bottom: 0.8em;
283 div.hdlist tr {
284 padding-bottom: 15px;
286 dt.hdlist1.strong, td.hdlist1.strong {
287 font-weight: bold;
289 td.hdlist1 {
290 vertical-align: top;
291 font-style: normal;
292 padding-right: 0.8em;
293 color: navy;
295 td.hdlist2 {
296 vertical-align: top;
298 div.hdlist.compact tr {
299 margin: 0;
300 padding-bottom: 0;
303 .comment {
304 background: yellow;
307 .footnote, .footnoteref {
308 font-size: 0.8em;
311 span.footnote, span.footnoteref {
312 vertical-align: super;
315 #footnotes {
316 margin: 20px 0 20px 0;
317 padding: 7px 0 0 0;
320 #footnotes div.footnote {
321 margin: 0 0 5px 0;
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;
334 div.colist td {
335 padding-right: 0.5em;
336 padding-bottom: 0.3em;
337 vertical-align: top;
339 div.colist td img {
340 margin-top: 0.3em;
343 @media print {
344 #footer-badges { display: none; }
347 #toc {
348 margin-bottom: 2.5em;
351 #toctitle {
352 color: #527bbd;
353 font-size: 1.1em;
354 font-weight: bold;
355 margin-top: 1.0em;
356 margin-bottom: 0.1em;
359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
360 margin-top: 0;
361 margin-bottom: 0;
363 div.toclevel2 {
364 margin-left: 2em;
365 font-size: 0.9em;
367 div.toclevel3 {
368 margin-left: 4em;
369 font-size: 0.9em;
371 div.toclevel4 {
372 margin-left: 6em;
373 font-size: 0.9em;
376 span.aqua { color: aqua; }
377 span.black { color: black; }
378 span.blue { color: blue; }
379 span.fuchsia { color: fuchsia; }
380 span.gray { color: gray; }
381 span.green { color: green; }
382 span.lime { color: lime; }
383 span.maroon { color: maroon; }
384 span.navy { color: navy; }
385 span.olive { color: olive; }
386 span.purple { color: purple; }
387 span.red { color: red; }
388 span.silver { color: silver; }
389 span.teal { color: teal; }
390 span.white { color: white; }
391 span.yellow { color: yellow; }
393 span.aqua-background { background: aqua; }
394 span.black-background { background: black; }
395 span.blue-background { background: blue; }
396 span.fuchsia-background { background: fuchsia; }
397 span.gray-background { background: gray; }
398 span.green-background { background: green; }
399 span.lime-background { background: lime; }
400 span.maroon-background { background: maroon; }
401 span.navy-background { background: navy; }
402 span.olive-background { background: olive; }
403 span.purple-background { background: purple; }
404 span.red-background { background: red; }
405 span.silver-background { background: silver; }
406 span.teal-background { background: teal; }
407 span.white-background { background: white; }
408 span.yellow-background { background: yellow; }
410 span.big { font-size: 2em; }
411 span.small { font-size: 0.6em; }
413 span.underline { text-decoration: underline; }
414 span.overline { text-decoration: overline; }
415 span.line-through { text-decoration: line-through; }
417 div.unbreakable { page-break-inside: avoid; }
421 * xhtml11 specific
423 * */
425 div.tableblock {
426 margin-top: 1.0em;
427 margin-bottom: 1.5em;
429 div.tableblock > table {
430 border: 3px solid #527bbd;
432 thead, p.table.header {
433 font-weight: bold;
434 color: #527bbd;
436 p.table {
437 margin-top: 0;
439 /* Because the table frame attribute is overridden by CSS in most browsers. */
440 div.tableblock > table[frame="void"] {
441 border-style: none;
443 div.tableblock > table[frame="hsides"] {
444 border-left-style: none;
445 border-right-style: none;
447 div.tableblock > table[frame="vsides"] {
448 border-top-style: none;
449 border-bottom-style: none;
454 * html5 specific
456 * */
458 table.tableblock {
459 margin-top: 1.0em;
460 margin-bottom: 1.5em;
462 thead, p.tableblock.header {
463 font-weight: bold;
464 color: #527bbd;
466 p.tableblock {
467 margin-top: 0;
469 table.tableblock {
470 border-width: 3px;
471 border-spacing: 0px;
472 border-style: solid;
473 border-color: #527bbd;
474 border-collapse: collapse;
476 th.tableblock, td.tableblock {
477 border-width: 1px;
478 padding: 4px;
479 border-style: solid;
480 border-color: #527bbd;
483 table.tableblock.frame-topbot {
484 border-left-style: hidden;
485 border-right-style: hidden;
487 table.tableblock.frame-sides {
488 border-top-style: hidden;
489 border-bottom-style: hidden;
491 table.tableblock.frame-none {
492 border-style: hidden;
495 th.tableblock.halign-left, td.tableblock.halign-left {
496 text-align: left;
498 th.tableblock.halign-center, td.tableblock.halign-center {
499 text-align: center;
501 th.tableblock.halign-right, td.tableblock.halign-right {
502 text-align: right;
505 th.tableblock.valign-top, td.tableblock.valign-top {
506 vertical-align: top;
508 th.tableblock.valign-middle, td.tableblock.valign-middle {
509 vertical-align: middle;
511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
512 vertical-align: bottom;
517 * manpage specific
519 * */
521 body.manpage h1 {
522 padding-top: 0.5em;
523 padding-bottom: 0.5em;
524 border-top: 2px solid silver;
525 border-bottom: 2px solid silver;
527 body.manpage h2 {
528 border-style: none;
530 body.manpage div.sectionbody {
531 margin-left: 3em;
534 @media print {
535 body.manpage div#toc { display: none; }
539 </style>
540 <script type="text/javascript">
541 /*<![CDATA[*/
542 var asciidoc = { // Namespace.
544 /////////////////////////////////////////////////////////////////////
545 // Table Of Contents generator
546 /////////////////////////////////////////////////////////////////////
548 /* Author: Mihai Bazon, September 2002
549 * http://students.infoiasi.ro/~mishoo
551 * Table Of Content generator
552 * Version: 0.4
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.
558 /* modified by Troy D. Hanson, September 2006. License: GPL */
559 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
561 // toclevels = 1..4.
562 toc: function (toclevels) {
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);
572 return text;
575 function TocEntry(el, text, toclevel) {
576 this.element = el;
577 this.text = text;
578 this.toclevel = toclevel;
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);
594 iterate(i);
598 iterate(el);
599 return result;
602 var toc = document.getElementById("toc");
603 if (!toc) {
604 return;
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);
617 for (i = 0; i < tocEntriesToRemove.length; i++) {
618 toc.removeChild(tocEntriesToRemove[i]);
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);
635 if (entries.length == 0)
636 toc.parentNode.removeChild(toc);
640 /////////////////////////////////////////////////////////////////////
641 // Footnotes generator
642 /////////////////////////////////////////////////////////////////////
644 /* Based on footnote generation code from:
645 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
648 footnotes: 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;
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);
661 for (i = 0; i < entriesToRemove.length; i++) {
662 noteholder.removeChild(entriesToRemove[i]);
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);
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;
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>]";
708 install: function(toclevels) {
709 var timerId;
711 function reinstall() {
712 asciidoc.footnotes();
713 if (toclevels) {
714 asciidoc.toc(toclevels);
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
720 reinstall();
723 timerId = setInterval(reinstall, 500);
724 if (document.addEventListener)
725 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
726 else
727 window.onload = reinstallAndRemoveTimer;
731 asciidoc.install();
732 /*]]>*/
733 </script>
734 </head>
735 <body class="manpage">
736 <div id="header">
737 <h1>
738 git-revert(1) Manual Page
739 </h1>
740 <h2>NAME</h2>
741 <div class="sectionbody">
742 <p>git-revert -
743 Revert some existing commits
744 </p>
745 </div>
746 </div>
747 <div id="content">
748 <div class="sect1">
749 <h2 id="_synopsis">SYNOPSIS</h2>
750 <div class="sectionbody">
751 <div class="verseblock">
752 <pre class="content"><em>git revert</em> [--[no-]edit] [-n] [-m &lt;parent-number&gt;] [-s] [-S[&lt;keyid&gt;]] &lt;commit&gt;&#8230;
753 <em>git revert</em> (--continue | --skip | --abort | --quit)</pre>
754 <div class="attribution">
755 </div></div>
756 </div>
757 </div>
758 <div class="sect1">
759 <h2 id="_description">DESCRIPTION</h2>
760 <div class="sectionbody">
761 <div class="paragraph"><p>Given one or more existing commits, revert the changes that the
762 related patches introduce, and record some new commits that record
763 them. This requires your working tree to be clean (no modifications
764 from the HEAD commit).</p></div>
765 <div class="paragraph"><p>Note: <em>git revert</em> is used to record some new commits to reverse the
766 effect of some earlier commits (often only a faulty one). If you want to
767 throw away all uncommitted changes in your working directory, you
768 should see <a href="git-reset.html">git-reset(1)</a>, particularly the <code>--hard</code> option. If
769 you want to extract specific files as they were in another commit, you
770 should see <a href="git-restore.html">git-restore(1)</a>, specifically the <code>--source</code>
771 option. Take care with these alternatives as
772 both will discard uncommitted changes in your working directory.</p></div>
773 <div class="paragraph"><p>See "Reset, restore and revert" in <a href="git.html">git(1)</a> for the differences
774 between the three commands.</p></div>
775 </div>
776 </div>
777 <div class="sect1">
778 <h2 id="_options">OPTIONS</h2>
779 <div class="sectionbody">
780 <div class="dlist"><dl>
781 <dt class="hdlist1">
782 &lt;commit&gt;&#8230;
783 </dt>
784 <dd>
786 Commits to revert.
787 For a more complete list of ways to spell commit names, see
788 <a href="gitrevisions.html">gitrevisions(7)</a>.
789 Sets of commits can also be given but no traversal is done by
790 default, see <a href="git-rev-list.html">git-rev-list(1)</a> and its <code>--no-walk</code>
791 option.
792 </p>
793 </dd>
794 <dt class="hdlist1">
796 </dt>
797 <dt class="hdlist1">
798 --edit
799 </dt>
800 <dd>
802 With this option, <em>git revert</em> will let you edit the commit
803 message prior to committing the revert. This is the default if
804 you run the command from a terminal.
805 </p>
806 </dd>
807 <dt class="hdlist1">
808 -m parent-number
809 </dt>
810 <dt class="hdlist1">
811 --mainline parent-number
812 </dt>
813 <dd>
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>
821 <div class="paragraph"><p>Reverting a merge commit declares that you will never want the tree changes
822 brought in by the merge. As a result, later merges will only bring in tree
823 changes introduced by commits that are not ancestors of the previously
824 reverted merge. This may or may not be what you want.</p></div>
825 <div class="paragraph"><p>See the <a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for
826 more details.</p></div>
827 </dd>
828 <dt class="hdlist1">
829 --no-edit
830 </dt>
831 <dd>
833 With this option, <em>git revert</em> will not start the commit
834 message editor.
835 </p>
836 </dd>
837 <dt class="hdlist1">
838 --cleanup=&lt;mode&gt;
839 </dt>
840 <dd>
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">
851 </dt>
852 <dt class="hdlist1">
853 --no-commit
854 </dt>
855 <dd>
857 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,
862 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.
865 </p>
866 <div class="paragraph"><p>This is useful when reverting more than one commits'
867 effect to your index in a row.</p></div>
868 </dd>
869 <dt class="hdlist1">
870 -S[&lt;keyid&gt;]
871 </dt>
872 <dt class="hdlist1">
873 --gpg-sign[=&lt;keyid&gt;]
874 </dt>
875 <dt class="hdlist1">
876 --no-gpg-sign
877 </dt>
878 <dd>
880 GPG-sign commits. The <code>keyid</code> argument is optional and
881 defaults to the committer identity; if specified, it must be
882 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>.
885 </p>
886 </dd>
887 <dt class="hdlist1">
889 </dt>
890 <dt class="hdlist1">
891 --signoff
892 </dt>
893 <dd>
895 Add a <code>Signed-off-by</code> trailer at the end of the commit message.
896 See the signoff option in <a href="git-commit.html">git-commit(1)</a> for more information.
897 </p>
898 </dd>
899 <dt class="hdlist1">
900 --strategy=&lt;strategy&gt;
901 </dt>
902 <dd>
904 Use the given merge strategy. Should only be used once.
905 See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
906 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>
917 Pass the merge strategy-specific option through to the
918 merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
919 </p>
920 </dd>
921 <dt class="hdlist1">
922 --rerere-autoupdate
923 </dt>
924 <dt class="hdlist1">
925 --no-rerere-autoupdate
926 </dt>
927 <dd>
929 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>.
936 </p>
937 </dd>
938 <dt class="hdlist1">
939 --reference
940 </dt>
941 <dd>
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>
951 </dl></div>
952 </div>
953 </div>
954 <div class="sect1">
955 <h2 id="_sequencer_subcommands">SEQUENCER SUBCOMMANDS</h2>
956 <div class="sectionbody">
957 <div class="dlist"><dl>
958 <dt class="hdlist1">
959 --continue
960 </dt>
961 <dd>
963 Continue the operation in progress using the information in
964 <code>.git/sequencer</code>. Can be used to continue after resolving
965 conflicts in a failed cherry-pick or revert.
966 </p>
967 </dd>
968 <dt class="hdlist1">
969 --skip
970 </dt>
971 <dd>
973 Skip the current commit and continue with the rest of the
974 sequence.
975 </p>
976 </dd>
977 <dt class="hdlist1">
978 --quit
979 </dt>
980 <dd>
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">
988 --abort
989 </dt>
990 <dd>
992 Cancel the operation and return to the pre-sequence state.
993 </p>
994 </dd>
995 </dl></div>
996 </div>
997 </div>
998 <div class="sect1">
999 <h2 id="_examples">EXAMPLES</h2>
1000 <div class="sectionbody">
1001 <div class="dlist"><dl>
1002 <dt class="hdlist1">
1003 <code>git revert HEAD~3</code>
1004 </dt>
1005 <dd>
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>
1011 <dt class="hdlist1">
1012 <code>git revert -n master~5..master~2</code>
1013 </dt>
1014 <dd>
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>
1025 </div>
1026 <div class="sect1">
1027 <h2 id="_configuration">CONFIGURATION</h2>
1028 <div class="sectionbody">
1029 <div class="paragraph"><p>Everything below this line in this section is selectively included
1030 from the <a href="git-config.html">git-config(1)</a> documentation. The content is the same
1031 as what&#8217;s found there:</p></div>
1032 <div class="dlist"><dl>
1033 <dt class="hdlist1">
1034 revert.reference
1035 </dt>
1036 <dd>
1038 Setting this variable to true makes <code>git revert</code> behave
1039 as if the <code>--reference</code> option is given.
1040 </p>
1041 </dd>
1042 </dl></div>
1043 </div>
1044 </div>
1045 <div class="sect1">
1046 <h2 id="_see_also">SEE ALSO</h2>
1047 <div class="sectionbody">
1048 <div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a></p></div>
1049 </div>
1050 </div>
1051 <div class="sect1">
1052 <h2 id="_git">GIT</h2>
1053 <div class="sectionbody">
1054 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1055 </div>
1056 </div>
1057 </div>
1058 <div id="footnotes"><hr /></div>
1059 <div id="footer">
1060 <div id="footer-text">
1061 Last updated
1062 2022-11-28 20:25:14 PST
1063 </div>
1064 </div>
1065 </body>
1066 </html>