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">
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-replace(
1)
</title>
9 <style type=
"text/css">
10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
14 font-family: Georgia,serif;
18 h1, h2, h3, h4, h5, h6,
19 div.title, caption.title,
20 thead, p.table.header,
22 #author, #revnumber, #revdate, #revremark,
24 font-family: Arial,Helvetica,sans-serif;
28 margin:
1em
5%
1em
5%;
33 text-decoration: underline;
49 h1, h2, h3, h4, h5, h6 {
57 border-bottom:
2px solid silver;
77 border:
1px solid silver;
88 ul
> li { color: #aaa; }
89 ul
> li
> * { color: black; }
91 .monospaced, code, pre {
92 font-family:
"Courier New", Courier, monospace;
99 white-space: pre-wrap;
109 #revnumber, #revdate, #revremark {
114 border-top:
2px solid silver;
120 padding-bottom:
0.5em;
124 padding-bottom:
0.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 {
135 margin-bottom:
1.5em;
137 div.admonitionblock {
139 margin-bottom:
2.0em;
144 div.content { /* Block element content. */
148 /* Block element titles. */
149 div.title, caption.title {
154 margin-bottom:
0.5em;
160 td div.title:first-child {
163 div.content div.title:first-child {
166 div.content + div.title {
170 div.sidebarblock
> div.content {
172 border:
1px solid #dddddd;
173 border-left:
4px solid #f0f0f0;
177 div.listingblock
> div.content {
178 border:
1px solid #dddddd;
179 border-left:
5px solid #f0f0f0;
184 div.quoteblock, div.verseblock {
188 border-left:
5px solid #f0f0f0;
192 div.quoteblock
> div.attribution {
197 div.verseblock
> pre.content {
198 font-family: inherit;
201 div.verseblock
> div.attribution {
205 /* DEPRECATED: Pre version
8.2.7 verse style literal block. */
206 div.verseblock + div.attribution {
210 div.admonitionblock .icon {
214 text-decoration: underline;
216 padding-right:
0.5em;
218 div.admonitionblock td.content {
220 border-left:
3px solid #dddddd;
223 div.exampleblock
> div.content {
224 border-left:
3px solid #dddddd;
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; }
234 margin-bottom:
0.8em;
247 list-style-position: outside;
250 list-style-type: decimal;
253 list-style-type: lower-alpha;
256 list-style-type: upper-alpha;
259 list-style-type: lower-roman;
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 {
269 margin-bottom:
0.1em;
281 margin-bottom:
0.8em;
284 padding-bottom:
15px;
286 dt.hdlist1.strong, td.hdlist1.strong {
292 padding-right:
0.8em;
298 div.hdlist.compact tr {
307 .footnote, .footnoteref {
311 span.footnote, span.footnoteref {
312 vertical-align: super;
316 margin:
20px
0 20px
0;
320 #footnotes div.footnote {
326 border-top:
1px solid silver;
335 padding-right:
0.5em;
336 padding-bottom:
0.3em;
344 #footer-badges { display: none; }
348 margin-bottom:
2.5em;
356 margin-bottom:
0.1em;
359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
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; }
427 margin-bottom:
1.5em;
429 div.tableblock
> table {
430 border:
3px solid #
527bbd;
432 thead, p.table.header {
439 /* Because the table frame attribute is overridden by CSS in most browsers. */
440 div.tableblock
> table[
frame=
"void"] {
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;
460 margin-bottom:
1.5em;
462 thead, p.tableblock.header {
473 border-color: #
527bbd;
474 border-collapse: collapse;
476 th.tableblock, td.tableblock {
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 {
498 th.tableblock.halign-center, td.tableblock.halign-center {
501 th.tableblock.halign-right, td.tableblock.halign-right {
505 th.tableblock.valign-top, td.tableblock.valign-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;
523 padding-bottom:
0.5em;
524 border-top:
2px solid silver;
525 border-bottom:
2px solid silver;
530 body.manpage div.sectionbody {
535 body.manpage div#toc { display: none; }
540 <script type=
"text/javascript">
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
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 */
562 toc: function (toclevels) {
564 function getText(el) {
566 for (var i = el.firstChild; i != null; i = i.nextSibling) {
567 if (i.nodeType ==
3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
569 else if (i.firstChild != null)
575 function TocEntry(el, text, toclevel) {
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
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);
602 var toc = document.getElementById(
"toc");
607 // Delete existing TOC entries in case we're reloading the TOC.
608 var tocEntriesToRemove = [];
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");
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.
651 var noteholder = document.getElementById(
"footnotes");
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");
670 for (i=
0; i
<spans.length; i++) {
671 if (spans[i].className ==
"footnote") {
673 var note = spans[i].getAttribute(
"data-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];
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;
692 noteholder.parentNode.removeChild(noteholder);
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.
701 "[<a href='#_footnote_" + n +
702 "' title='View footnote' class='footnote'>" + n +
"</a>]";
708 install: function(toclevels) {
711 function reinstall() {
712 asciidoc.footnotes();
714 asciidoc.toc(toclevels);
718 function reinstallAndRemoveTimer() {
719 clearInterval(timerId);
723 timerId = setInterval(reinstall,
500);
724 if (document.addEventListener)
725 document.addEventListener(
"DOMContentLoaded", reinstallAndRemoveTimer, false);
727 window.onload = reinstallAndRemoveTimer;
735 <body class=
"manpage">
738 git-replace(
1) Manual Page
741 <div class=
"sectionbody">
743 Create, list, delete refs to replace objects
749 <h2 id=
"_synopsis">SYNOPSIS
</h2>
750 <div class=
"sectionbody">
751 <div class=
"verseblock">
752 <pre class=
"content"><em>git replace
</em> [-f]
<object
> <replacement
>
753 <em>git replace
</em> [-f] --edit
<object
>
754 <em>git replace
</em> [-f] --graft
<commit
> [
<parent
>…]
755 <em>git replace
</em> [-f] --convert-graft-file
756 <em>git replace
</em> -d
<object
>…
757 <em>git replace
</em> [--format=
<format
>] [-l [
<pattern
>]]
</pre>
758 <div class=
"attribution">
763 <h2 id=
"_description">DESCRIPTION
</h2>
764 <div class=
"sectionbody">
765 <div class=
"paragraph"><p>Adds a
<em>replace
</em> reference in
<code>refs/replace/
</code> namespace.
</p></div>
766 <div class=
"paragraph"><p>The name of the
<em>replace
</em> reference is the SHA-
1 of the object that is
767 replaced. The content of the
<em>replace
</em> reference is the SHA-
1 of the
768 replacement object.
</p></div>
769 <div class=
"paragraph"><p>The replaced object and the replacement object must be of the same type.
770 This restriction can be bypassed using
<code>-f
</code>.
</p></div>
771 <div class=
"paragraph"><p>Unless
<code>-f
</code> is given, the
<em>replace
</em> reference must not yet exist.
</p></div>
772 <div class=
"paragraph"><p>There is no other restriction on the replaced and replacement objects.
773 Merge commits can be replaced by non-merge commits and vice versa.
</p></div>
774 <div class=
"paragraph"><p>Replacement references will be used by default by all Git commands
775 except those doing reachability traversal (prune, pack transfer and
777 <div class=
"paragraph"><p>It is possible to disable use of replacement references for any
778 command using the
<code>--no-replace-objects
</code> option just after
<em>git
</em>.
</p></div>
779 <div class=
"paragraph"><p>For example if commit
<em>foo
</em> has been replaced by commit
<em>bar
</em>:
</p></div>
780 <div class=
"listingblock">
781 <div class=
"content">
782 <pre><code>$ git --no-replace-objects cat-file commit foo
</code></pre>
784 <div class=
"paragraph"><p>shows information about commit
<em>foo
</em>, while:
</p></div>
785 <div class=
"listingblock">
786 <div class=
"content">
787 <pre><code>$ git cat-file commit foo
</code></pre>
789 <div class=
"paragraph"><p>shows information about commit
<em>bar
</em>.
</p></div>
790 <div class=
"paragraph"><p>The
<code>GIT_NO_REPLACE_OBJECTS
</code> environment variable can be set to
791 achieve the same effect as the
<code>--no-replace-objects
</code> option.
</p></div>
795 <h2 id=
"_options">OPTIONS
</h2>
796 <div class=
"sectionbody">
797 <div class=
"dlist"><dl>
806 If an existing replace ref for the same object exists, it will
807 be overwritten (instead of failing).
818 Delete existing replace refs for the given objects.
822 --edit
<object
>
826 Edit an object
’s content interactively. The existing content
827 for
<object
> is pretty-printed into a temporary file, an
828 editor is launched on the file, and the result is parsed to
829 create a new object of the same type as
<object
>. A
830 replacement ref is then created to replace
<object
> with the
831 newly created object. See
<a href=
"git-var.html">git-var(
1)
</a> for details about
832 how the editor will be chosen.
840 When editing, provide the raw object contents rather than
841 pretty-printed ones. Currently this only affects trees, which
842 will be shown in their binary form. This is harder to work with,
843 but can help when repairing a tree that is so corrupted it
844 cannot be pretty-printed. Note that you may need to configure
845 your editor to cleanly read and write binary data.
849 --graft
<commit
> [
<parent
>…]
853 Create a graft commit. A new commit is created with the same
854 content as
<commit
> except that its parents will be
855 [
<parent
>…] instead of
<commit
>'s parents. A replacement ref
856 is then created to replace
<commit
> with the newly created
857 commit. Use
<code>--convert-graft-file
</code> to convert a
858 <code>$GIT_DIR/info/grafts
</code> file and use replace refs instead.
866 Creates graft commits for all entries in
<code>$GIT_DIR/info/grafts
</code>
867 and deletes that file upon success. The purpose is to help users
868 with transitioning off of the now-deprecated graft file.
875 --list
<pattern
>
879 List replace refs for objects that match the given pattern (or
880 all if no pattern is given).
881 Typing
"git replace" without arguments, also lists all replace
886 --format=
<format
>
890 When listing, use the specified
<format
>, which can be one of
891 <em>short
</em>,
<em>medium
</em> and
<em>long
</em>. When omitted, the format
892 defaults to
<em>short
</em>.
899 <h2 id=
"_formats">FORMATS
</h2>
900 <div class=
"sectionbody">
901 <div class=
"paragraph"><p>The following format are available:
</p></div>
902 <div class=
"ulist"><ul>
906 <replaced sha1
>
912 <replaced sha1
> → <replacement sha1
>
918 <replaced sha1
> (
<replaced type
>)
→ <replacement sha1
> (
<replacement type
>)
925 <h2 id=
"_creating_replacement_objects">CREATING REPLACEMENT OBJECTS
</h2>
926 <div class=
"sectionbody">
927 <div class=
"paragraph"><p><a href=
"git-hash-object.html">git-hash-object(
1)
</a>,
<a href=
"git-rebase.html">git-rebase(
1)
</a>, and
928 <a href=
"https://github.com/newren/git-filter-repo">git-filter-repo
</a>, among other git commands, can be used to
929 create replacement objects from existing objects. The
<code>--edit
</code> option
930 can also be used with
<em>git replace
</em> to create a replacement object by
931 editing an existing object.
</p></div>
932 <div class=
"paragraph"><p>If you want to replace many blobs, trees or commits that are part of a
933 string of commits, you may just want to create a replacement string of
934 commits and then only replace the commit at the tip of the target
935 string of commits with the commit at the tip of the replacement string
936 of commits.
</p></div>
940 <h2 id=
"_bugs">BUGS
</h2>
941 <div class=
"sectionbody">
942 <div class=
"paragraph"><p>Comparing blobs or trees that have been replaced with those that
943 replace them will not work properly. And using
<code>git reset --hard
</code> to
944 go back to a replaced commit will move the branch to the replacement
945 commit instead of the replaced commit.
</p></div>
946 <div class=
"paragraph"><p>There may be other problems when using
<em>git rev-list
</em> related to
947 pending objects.
</p></div>
951 <h2 id=
"_see_also">SEE ALSO
</h2>
952 <div class=
"sectionbody">
953 <div class=
"paragraph"><p><a href=
"git-hash-object.html">git-hash-object(
1)
</a>
954 <a href=
"git-rebase.html">git-rebase(
1)
</a>
955 <a href=
"git-tag.html">git-tag(
1)
</a>
956 <a href=
"git-branch.html">git-branch(
1)
</a>
957 <a href=
"git-commit.html">git-commit(
1)
</a>
958 <a href=
"git-var.html">git-var(
1)
</a>
959 <a href=
"git.html">git(
1)
</a>
960 <a href=
"https://github.com/newren/git-filter-repo">git-filter-repo
</a></p></div>
964 <h2 id=
"_git">GIT
</h2>
965 <div class=
"sectionbody">
966 <div class=
"paragraph"><p>Part of the
<a href=
"git.html">git(
1)
</a> suite
</p></div>
970 <div id=
"footnotes"><hr /></div>
972 <div id=
"footer-text">
974 2020-
03-
10 15:
02:
33 PDT