diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-06-21 15:23:55 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-06-21 15:23:55 +0000 |
| commit | bb88cf46ef8a2521a253db9ab576e12202a54fa5 (patch) | |
| tree | bbc5092df07bff8072a1d42a422ab68b4dbd7aac /git-rebase.html | |
| parent | f5de4cf4e1e8bccd17515d71186e752f4716cac9 (diff) | |
| download | git-htmldocs-bb88cf46ef8a2521a253db9ab576e12202a54fa5.tar.gz | |
Autogenerated HTML docs for v1.7.1-524-g6df2
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index f0c80ca75..644d172d2 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -723,6 +723,9 @@ the reversion" (see the <p>
Instead of ignoring merges, try to recreate them.
</p>
+<div class="para"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
+with the <tt>--interactive</tt> option explicitly is generally not a good
+idea unless you know what you are doing (see BUGS below).</p></div>
</dd>
<dt>
--root
@@ -1209,6 +1212,30 @@ saying (for the reflog case, and assuming you are on <em>topic</em> already):</p <em>everyone</em> downstream from <em>topic</em> will now have to perform a "hard
case" recovery too!</p></div>
</div>
+<h2 id="_bugs">BUGS</h2>
+<div class="sectionbody">
+<div class="para"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
+represent the topology of the revision graph. Editing commits and
+rewording their commit messages should work fine, but attempts to
+reorder commits tend to produce counterintuitive results.</p></div>
+<div class="para"><p>For example, an attempt to rearrange</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>1 --- 2 --- 3 --- 4 --- 5</tt></pre>
+</div></div>
+<div class="para"><p>to</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>1 --- 2 --- 4 --- 3 --- 5</tt></pre>
+</div></div>
+<div class="para"><p>by moving the "pick 4" line will result in the following history:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt> 3
+ /
+1 --- 2 --- 4 --- 5</tt></pre>
+</div></div>
+</div>
<h2 id="_authors">Authors</h2>
<div class="sectionbody">
<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and
@@ -1224,7 +1251,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-06-02 23:32:08 UTC
+Last updated 2010-06-21 15:23:41 UTC
</div>
</div>
</body>
|