summaryrefslogtreecommitdiffstats
path: root/git-svn.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-10-18 17:02:08 -0700
committerJunio C Hamano <gitster@pobox.com>2021-10-18 17:02:08 -0700
commit59646279943e7720dcd1ffef1d24ce9e101c39f4 (patch)
treed04a140f5d2291dd891733f54242b2e5c679175f /git-svn.txt
parent7b1585b6902973456b47ee9acd8a01365e52a4df (diff)
downloadgit-htmldocs-59646279943e7720dcd1ffef1d24ce9e101c39f4.tar.gz
Autogenerated HTML docs for v2.33.1-711-g9d530
Diffstat (limited to 'git-svn.txt')
-rw-r--r--git-svn.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-svn.txt b/git-svn.txt
index d5776ffcf..222b556d7 100644
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -678,7 +678,6 @@ config key: svn.authorsProg
--strategy=<strategy>::
-p::
--rebase-merges::
---preserve-merges (DEPRECATED)::
These are only used with the 'dcommit' and 'rebase' commands.
+
Passed directly to 'git rebase' when using 'dcommit' if a