diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 14:34:00 -0700 |
commit | e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch) | |
tree | b782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-rebase.html | |
parent | 0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff) | |
download | git-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz |
Autogenerated HTML docs for v1.8.4-357-g8d83
Diffstat (limited to 'git-rebase.html')
-rw-r--r-- | git-rebase.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase.html b/git-rebase.html index ea574ff25..fcc57851a 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -1172,7 +1172,7 @@ which makes little sense.</p></div> reverting a topic branch merge, as this option recreates the topic branch with
fresh commits so it can be remerged successfully without needing to "revert
the reversion" (see the
-<a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
+<a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for details).</p></div>
</dd>
<dt class="hdlist1">
--ignore-whitespace
@@ -1318,7 +1318,7 @@ used to override and disable this setting.</p></div> <div class="paragraph"><p>You may find this helpful after reverting a topic branch merge, as this option
recreates the topic branch with fresh commits so it can be remerged
successfully without needing to "revert the reversion" (see the
-<a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
+<a href="howto/revert-a-faulty-merge.html">revert-a-faulty-merge How-To</a> for details).</p></div>
</dd>
</dl></div>
</div>
@@ -1934,7 +1934,7 @@ reorder commits tend to produce counterintuitive results.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
|