X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-svnimport.txt;h=f8dbee70961f932e1c2be29bd11d862d9b1c002c;hb=17dff84b5e745ba17a5b3ae5591d79f96b165d48;hp=a144c6c31ca9131b00be1585a785ede53f87a731;hpb=7ee74a99b2b710b5f5adc22db2fe0aca8a74c809;p=git.git

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index a144c6c3..f8dbee70 100644
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -9,10 +9,11 @@ git-svnimport - Import a SVN repository into git
 
 SYNOPSIS
 --------
-'git-svnimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
-			[ -C <GIT_repository> ] [ -i ] [ -u ]
+'git-svnimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]
+			[ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]
 			[ -b branch_subdir ] [ -t trunk_subdir ] [ -T tag_subdir ]
-			[ -s start_chg ] [ -m ] [ -M regex ] [ <SVN_repository_URL> ]
+			[ -s start_chg ] [ -m ] [ -M regex ]
+			<SVN_repository_URL> [ <path> ]
 
 
 DESCRIPTION
@@ -28,7 +29,7 @@ directories for branches, and "/tags/FOO" directories for tags.
 Other subdirectories are ignored.
 
 git-svnimport creates a file ".git/svn2git", which is required for
-incremental SVN imports. 
+incremental SVN imports.
 
 OPTIONS
 -------
@@ -43,39 +44,68 @@ When importing incementally, you might need to edit the .git/svn2git file.
 
 -i::
 	Import-only: don't perform a checkout after importing.  This option
-	ensures the working directory and cache remain untouched and will
+	ensures the working directory and index remain untouched and will
 	not create them if they do not exist.
 
 -t <trunk_subdir>::
 	Name the SVN trunk. Default "trunk".
-	
+
 -T <tag_subdir>::
 	Name the SVN subdirectory for tags. Default "tags".
-	
+
 -b <branch_subdir>::
 	Name the SVN subdirectory for branches. Default "branches".
-	
+
 -o <branch-for-HEAD>::
 	The 'trunk' branch from SVN is imported to the 'origin' branch within
 	the git repository. Use this option if you want to import into a
 	different branch.
 
--m::    
+-m::
 	Attempt to detect merges based on the commit message. This option
-	will enable default regexes that try to capture the name source 
-	branch name from the commit message. 
+	will enable default regexes that try to capture the name source
+	branch name from the commit message.
 
 -M <regex>::
 	Attempt to detect merges based on the commit message with a custom
-	regex. It can be used with -m to also see the default regexes. 
-	You must escape forward slashes. 
+	regex. It can be used with -m to also see the default regexes.
+	You must escape forward slashes.
+
+-l <max_rev>::
+	Specify a maximum revision number to pull.
+
+	Formerly, this option controlled how many revisions to pull, due to
+	SVN memory leaks. (These have been worked around.)
 
 -v::
 	Verbosity: let 'svnimport' report what it is doing.
 
+-d::
+	Use direct HTTP requests if possible. The "<path>" argument is used
+	only for retrieving the SVN logs; the path to the contents is
+	included in the SVN log.
+
+-D::
+	Use direct HTTP requests if possible. The "<path>" argument is used
+	for retrieving the logs, as well as for the contents.
++
+There's no safe way to automatically find out which of these options to
+use, so you need to try both. Usually, the one that's wrong will die
+with a 40x error pretty quickly.
+
 <SVN_repository_URL>::
 	The URL of the SVN module you want to import. For local
 	repositories, use "file:///absolute/path".
++
+If you're using the "-d" or "-D" option, this is the URL of the SVN
+repository itself; it usually ends in "/svn".
+
+<SVN_repository_URL>::
+	The URL of the SVN module you want to import. For local
+	repositories, use "file:///absolute/path".
+
+<path>
+	The path to the module you want to check out.
 
 -h::
 	Print a short usage message and exit.