Autogenerated HTML docs for v1.7.4-rc2-20-g8c0db6
[git/jnareb-git.git] / git-replace.html
blob11f6db9970f54cd8dc8b37d268918a910e6e7693
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head>
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6 <meta name="generator" content="AsciiDoc 8.2.5" />
7 <style type="text/css">
8 /* Debug borders */
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11 border: 1px solid red;
15 body {
16 margin: 1em 5% 1em 5%;
19 a {
20 color: blue;
21 text-decoration: underline;
23 a:visited {
24 color: fuchsia;
27 em {
28 font-style: italic;
31 strong {
32 font-weight: bold;
35 tt {
36 color: navy;
39 h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
47 h1, h2, h3 {
48 border-bottom: 2px solid silver;
50 h2 {
51 padding-top: 0.5em;
53 h3 {
54 float: left;
56 h3 + * {
57 clear: left;
60 div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
65 hr {
66 border: 1px solid silver;
69 p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
74 pre {
75 padding: 0;
76 margin: 0;
79 span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
83 font-size: 1.1em;
85 span#email {
87 span#revision {
88 font-family: sans-serif;
91 div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
98 div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
102 div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
107 div#preamble,
108 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110 div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
115 div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
120 div.content { /* Block element content. */
121 padding: 0;
124 /* Block element titles. */
125 div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
132 div.title + * {
133 margin-top: 0;
136 td div.title:first-child {
137 margin-top: 0.0em;
139 div.content div.title:first-child {
140 margin-top: 0.0em;
142 div.content + div.title {
143 margin-top: 0.0em;
146 div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
152 div.listingblock {
153 margin-right: 0%;
155 div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
161 div.quoteblock > div.content {
162 padding-left: 2.0em;
165 div.attribution {
166 text-align: right;
168 div.verseblock + div.attribution {
169 text-align: left;
172 div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
180 div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
185 div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
190 div.verseblock div.content {
191 white-space: pre;
194 div.imageblock div.content { padding-left: 0; }
195 div.imageblock img { border: 1px solid silver; }
196 span.image img { border-style: none; }
198 dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
202 dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
207 dd > *:first-child {
208 margin-top: 0;
211 ul, ol {
212 list-style-position: outside;
214 div.olist2 ol {
215 list-style-type: lower-alpha;
218 div.tableblock > table {
219 border: 3px solid #527bbd;
221 thead {
222 font-family: sans-serif;
223 font-weight: bold;
225 tfoot {
226 font-weight: bold;
229 div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
233 div.hlist td {
234 padding-bottom: 5px;
236 td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
241 td.hlist2 {
242 vertical-align: top;
245 @media print {
246 div#footer-badges { display: none; }
249 div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
258 div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
262 div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
266 div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
270 div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
274 include1::./stylesheets/xhtml11-manpage.css[]
275 /* Workarounds for IE6's broken and incomplete CSS2. */
277 div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
282 div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
289 div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
295 div.quoteblock-content {
296 padding-left: 2.0em;
299 div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
304 /* IE6 sets dynamically generated links as visited. */
305 div#toc a:visited { color: blue; }
306 </style>
307 <title>git-replace(1)</title>
308 </head>
309 <body>
310 <div id="header">
311 <h1>
312 git-replace(1) Manual Page
313 </h1>
314 <h2>NAME</h2>
315 <div class="sectionbody">
316 <p>git-replace -
317 Create, list, delete refs to replace objects
318 </p>
319 </div>
320 </div>
321 <h2>SYNOPSIS</h2>
322 <div class="sectionbody">
323 <div class="verseblock">
324 <div class="content"><em>git replace</em> [-f] &lt;object&gt; &lt;replacement&gt;
325 <em>git replace</em> -d &lt;object&gt;&#8230;
326 <em>git replace</em> -l [&lt;pattern&gt;]</div></div>
327 </div>
328 <h2 id="_description">DESCRIPTION</h2>
329 <div class="sectionbody">
330 <div class="para"><p>Adds a <em>replace</em> reference in <tt>.git/refs/replace/</tt></p></div>
331 <div class="para"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is
332 replaced. The content of the <em>replace</em> reference is the SHA1 of the
333 replacement object.</p></div>
334 <div class="para"><p>Unless <tt>-f</tt> is given, the <em>replace</em> reference must not yet exist in
335 <tt>.git/refs/replace/</tt> directory.</p></div>
336 <div class="para"><p>Replacement references will be used by default by all git commands
337 except those doing reachability traversal (prune, pack transfer and
338 fsck).</p></div>
339 <div class="para"><p>It is possible to disable use of replacement references for any
340 command using the <tt>--no-replace-objects</tt> option just after <em>git</em>.</p></div>
341 <div class="para"><p>For example if commit <em>foo</em> has been replaced by commit <em>bar</em>:</p></div>
342 <div class="listingblock">
343 <div class="content">
344 <pre><tt>$ git --no-replace-objects cat-file commit foo</tt></pre>
345 </div></div>
346 <div class="para"><p>shows information about commit <em>foo</em>, while:</p></div>
347 <div class="listingblock">
348 <div class="content">
349 <pre><tt>$ git cat-file commit foo</tt></pre>
350 </div></div>
351 <div class="para"><p>shows information about commit <em>bar</em>.</p></div>
352 <div class="para"><p>The <em>GIT_NO_REPLACE_OBJECTS</em> environment variable can be set to
353 achieve the same effect as the <tt>--no-replace-objects</tt> option.</p></div>
354 </div>
355 <h2 id="_options">OPTIONS</h2>
356 <div class="sectionbody">
357 <div class="vlist"><dl>
358 <dt>
360 </dt>
361 <dd>
363 If an existing replace ref for the same object exists, it will
364 be overwritten (instead of failing).
365 </p>
366 </dd>
367 <dt>
369 </dt>
370 <dd>
372 Delete existing replace refs for the given objects.
373 </p>
374 </dd>
375 <dt>
376 -l &lt;pattern&gt;
377 </dt>
378 <dd>
380 List replace refs for objects that match the given pattern (or
381 all if no pattern is given).
382 Typing "git replace" without arguments, also lists all replace
383 refs.
384 </p>
385 </dd>
386 </dl></div>
387 </div>
388 <h2 id="_bugs">BUGS</h2>
389 <div class="sectionbody">
390 <div class="para"><p>Comparing blobs or trees that have been replaced with those that
391 replace them will not work properly. And using <tt>git reset --hard</tt> to
392 go back to a replaced commit will move the branch to the replacement
393 commit instead of the replaced commit.</p></div>
394 <div class="para"><p>There may be other problems when using <em>git rev-list</em> related to
395 pending objects. And of course things may break if an object of one
396 type is replaced by an object of another type (for example a blob
397 replaced by a commit).</p></div>
398 </div>
399 <h2 id="_see_also">SEE ALSO</h2>
400 <div class="sectionbody">
401 <div class="para"><p><a href="git-tag.html">git-tag(1)</a>
402 <a href="git-branch.html">git-branch(1)</a>
403 <a href="git.html">git(1)</a></p></div>
404 </div>
405 <h2 id="_author">Author</h2>
406 <div class="sectionbody">
407 <div class="para"><p>Written by Christian Couder &lt;chriscool@tuxfamily.org&gt; and Junio C
408 Hamano &lt;gitster@pobox.com&gt;, based on <em>git tag</em> by Kristian Hogsberg
409 &lt;krh@redhat.com&gt; and Carlos Rica &lt;jasampler@gmail.com&gt;.</p></div>
410 </div>
411 <h2 id="_documentation">Documentation</h2>
412 <div class="sectionbody">
413 <div class="para"><p>Documentation by Christian Couder &lt;chriscool@tuxfamily.org&gt; and the
414 git-list &lt;git@vger.kernel.org&gt;, based on <em>git tag</em> documentation.</p></div>
415 </div>
416 <h2 id="_git">GIT</h2>
417 <div class="sectionbody">
418 <div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
419 </div>
420 <div id="footer">
421 <div id="footer-text">
422 Last updated 2010-09-18 23:56:54 UTC
423 </div>
424 </div>
425 </body>
426 </html>