diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 14:14:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 14:14:05 -0700 |
commit | c8c398a6f8bcc99ada4d46b978e42188c7302b6b (patch) | |
tree | 9a36bd3ee2c827f53e1f7c42e5db6185e58b908b /git-replace.html | |
parent | 77bf41c9a06096eb0fa21adc316739f2e493f5d1 (diff) | |
download | git-htmldocs-c8c398a6f8bcc99ada4d46b978e42188c7302b6b.tar.gz |
Autogenerated HTML docs for v2.0.0-390-gcb682
Diffstat (limited to 'git-replace.html')
-rw-r--r-- | git-replace.html | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/git-replace.html b/git-replace.html index a547a3b43..ec26d6ac1 100644 --- a/git-replace.html +++ b/git-replace.html @@ -751,6 +751,7 @@ git-replace(1) Manual Page <div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git replace</em> [-f] <object> <replacement>
+<em>git replace</em> [-f] --edit <object>
<em>git replace</em> -d <object>…
<em>git replace</em> [--format=<format>] [-l [<pattern>]]</pre>
<div class="attribution">
@@ -817,6 +818,20 @@ achieve the same effect as the <tt>--no-replace-objects</tt> option.</p></div> </p>
</dd>
<dt class="hdlist1">
+--edit <object>
+</dt>
+<dd>
+<p>
+ Edit an object’s content interactively. The existing content
+ for <object> is pretty-printed into a temporary file, an
+ editor is launched on the file, and the result is parsed to
+ create a new object of the same type as <object>. A
+ replacement ref is then created to replace <object> with the
+ newly created object. See <a href="git-var.html">git-var(1)</a> for details about
+ how the editor will be chosen.
+</p>
+</dd>
+<dt class="hdlist1">
-l <pattern>
</dt>
<dt class="hdlist1">
@@ -874,7 +889,9 @@ achieve the same effect as the <tt>--no-replace-objects</tt> option.</p></div> <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
<a href="git-rebase.html">git-rebase(1)</a>, among other git commands, can be used to create
-replacement objects from existing objects.</p></div>
+replacement objects from existing objects. The <tt>--edit</tt> option can
+also be used with <em>git replace</em> to create a replacement object by
+editing an existing object.</p></div>
<div class="paragraph"><p>If you want to replace many blobs, trees or commits that are part of a
string of commits, you may just want to create a replacement string of
commits and then only replace the commit at the tip of the target
@@ -901,6 +918,8 @@ pending objects.</p></div> <a href="git-rebase.html">git-rebase(1)</a>
<a href="git-tag.html">git-tag(1)</a>
<a href="git-branch.html">git-branch(1)</a>
+<a href="git-commit.html">git-commit(1)</a>
+<a href="git-var.html">git-var(1)</a>
<a href="git.html">git(1)</a></p></div>
</div>
</div>
@@ -914,7 +933,7 @@ pending objects.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-01-10 12:32:20 PST
+Last updated 2014-06-16 14:13:22 PDT
</div>
</div>
</body>
|