Merge branch 'sp/maint-no-thin'

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index b166cf3327380a8f386825a7fbce92f2447bb54e..71aad8b45bd4c5f59c2ce3746cb3299821729c2a 100644 (file)
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -27,7 +27,7 @@ repository, or incrementally import into an existing one.
 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"
+"trunk" directory where the main development happens, "branches/FOO"
 directories for branches, and "/tags/FOO" directories for tags.
 Other subdirectories are ignored.
 
@@ -68,6 +68,9 @@ When importing incrementally, you might need to edit the .git/svn2git file.
        Prepend 'rX: ' to commit messages, where X is the imported
        subversion revision.
 
+-u::
+       Replace underscores in tag names with periods.
+
 -I <ignorefile_name>::
        Import the svn:ignore directory property to files with this
        name in each directory. (The Subversion and GIT ignore
@@ -174,4 +177,3 @@ Documentation by Matthias Urlichs <smurf@smurf.noris.de>.
 GIT
 ---
 Part of the gitlink:git[7] suite
-