summaryrefslogtreecommitdiffstats
path: root/git-svn.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-05 14:22:00 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-05 14:22:00 -0800
commitb3f862c5e7e19d0ae8abc32492356ff7d1578110 (patch)
tree95b41daba023b1705d5ec5b8d4db399c8cbc3f9d /git-svn.html
parent8ef91f31f6606a0370b18943c3b0f089e04873f9 (diff)
downloadgit-htmldocs-b3f862c5e7e19d0ae8abc32492356ff7d1578110.tar.gz
Autogenerated HTML docs for v2.24.0-390-g083378
Diffstat (limited to 'git-svn.html')
-rw-r--r--git-svn.html7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-svn.html b/git-svn.html
index abb265dce..e126b07e5 100644
--- a/git-svn.html
+++ b/git-svn.html
@@ -1914,7 +1914,10 @@ not found, it is searched like any other command in <em>$PATH</em>.</p></div>
-p
</dt>
<dt class="hdlist1">
---preserve-merges
+--rebase-merges
+</dt>
+<dt class="hdlist1">
+--preserve-merges (DEPRECATED)
</dt>
<dd>
<p>
@@ -2514,7 +2517,7 @@ rewinds it.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2019-09-29 22:04:22 PDT
+ 2019-12-05 14:19:10 PST
</div>
</div>
</body>