avoid makefile override warning

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index f8dbee70961f932e1c2be29bd11d862d9b1c002c..5c543d5d1b40d1d60be27ad784c3917165037055 100644 (file)
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 --------
 '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 ]
+                       [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]
                        [ -s start_chg ] [ -m ] [ -M regex ]
                        <SVN_repository_URL> [ <path> ]
 
@@ -21,7 +21,7 @@ DESCRIPTION
 Imports a SVN repository into git. It will either create a new
 repository, or incrementally import into an existing one.
 
-SVN access is done by the SVN:: Perl module.
+SVN access is done by the SVN::Perl module.
 
 git-svnimport assumes that SVN repositories are organized into one
 "trunk" directory where the main development happens, "branch/FOO"
@@ -40,17 +40,17 @@ OPTIONS
 -s <start_rev>::
         Start importing at this SVN change number. The  default is 1.
 +
-When importing incementally, you might need to edit the .git/svn2git file.
+When importing incrementally, 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 index remain untouched and will
        not create them if they do not exist.
 
--t <trunk_subdir>::
+-T <trunk_subdir>::
        Name the SVN trunk. Default "trunk".
 
--T <tag_subdir>::
+-t <tag_subdir>::
        Name the SVN subdirectory for tags. Default "tags".
 
 -b <branch_subdir>::
@@ -61,6 +61,10 @@ When importing incementally, you might need to edit the .git/svn2git file.
        the git repository. Use this option if you want to import into a
        different branch.
 
+-r::
+       Prepend 'rX: ' to commit messages, where X is the imported
+       subversion revision.
+
 -m::
        Attempt to detect merges based on the commit message. This option
        will enable default regexes that try to capture the name source
@@ -74,8 +78,8 @@ When importing incementally, you might need to edit the .git/svn2git file.
 -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.)
+       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.
@@ -100,11 +104,7 @@ with a 40x error pretty quickly.
 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>
+<path>::
        The path to the module you want to check out.
 
 -h::