summaryrefslogtreecommitdiffstats
path: root/git-replace.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 12:33:07 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 12:33:07 -0800
commit21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d (patch)
treedeb6d03b38893fa4dba338ae565980a5086fa585 /git-replace.html
parent9906f1f2277410d5f7fedc74ded20e8490812568 (diff)
downloadgit-htmldocs-21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d.tar.gz
Autogenerated HTML docs for v1.8.5.2-309-ga2501
Diffstat (limited to 'git-replace.html')
-rw-r--r--git-replace.html40
1 files changed, 38 insertions, 2 deletions
diff --git a/git-replace.html b/git-replace.html
index 77d3a0e9d..1ceacff47 100644
--- a/git-replace.html
+++ b/git-replace.html
@@ -748,7 +748,7 @@ git-replace(1) Manual Page
<div class="verseblock">
<pre class="content"><em>git replace</em> [-f] &lt;object&gt; &lt;replacement&gt;
<em>git replace</em> -d &lt;object&gt;&#8230;
-<em>git replace</em> -l [&lt;pattern&gt;]</pre>
+<em>git replace</em> [--format=&lt;format&gt;] [-l [&lt;pattern&gt;]]</pre>
<div class="attribution">
</div></div>
</div>
@@ -826,10 +826,46 @@ achieve the same effect as the <code>--no-replace-objects</code> option.</p></di
refs.
</p>
</dd>
+<dt class="hdlist1">
+--format=&lt;format&gt;
+</dt>
+<dd>
+<p>
+ When listing, use the specified &lt;format&gt;, which can be one of
+ <em>short</em>, <em>medium</em> and <em>long</em>. When omitted, the format
+ defaults to <em>short</em>.
+</p>
+</dd>
</dl></div>
</div>
</div>
<div class="sect1">
+<h2 id="_formats">FORMATS</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>The following format are available:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>short</em>:
+ &lt;replaced sha1&gt;
+</p>
+</li>
+<li>
+<p>
+<em>medium</em>:
+ &lt;replaced sha1&gt; &#8594; &lt;replacement sha1&gt;
+</p>
+</li>
+<li>
+<p>
+<em>long</em>:
+ &lt;replaced sha1&gt; (&lt;replaced type&gt;) &#8594; &lt;replacement sha1&gt; (&lt;replacement type&gt;)
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_creating_replacement_objects">CREATING REPLACEMENT OBJECTS</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-filter-branch.html">git-filter-branch(1)</a>, <a href="git-hash-object.html">git-hash-object(1)</a> and
@@ -874,7 +910,7 @@ pending objects.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-10-15 11:39:58 PDT
+Last updated 2014-01-10 12:32:20 PST
</div>
</div>
</body>