X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-svnimport.txt;h=b1b87c2fcd9b60aef6fb937bd4d28572f1cb8463;hb=refs%2Fheads%2Fhtml;hp=c95ff84f6aa7172c328a93be140a85a4e9ef7a09;hpb=2abe7e860dae61000d304bc1e865406ddc7e4ba1;p=git.git

diff --git a/git-svnimport.txt b/git-svnimport.txt
index c95ff84f..b1b87c2f 100644
--- a/git-svnimport.txt
+++ b/git-svnimport.txt
@@ -9,11 +9,13 @@ git-svnimport - Import a SVN repository into git
 
 SYNOPSIS
 --------
+[verse]
 '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 ] [ -r ] [ -M regex ]
-		[ -I <ignorefile_name> ] <SVN_repository_URL> [ <path> ]
+		[ -I <ignorefile_name> ] [ -A <author_file> ]
+		<SVN_repository_URL> [ <path> ]
 
 
 DESCRIPTION
@@ -71,6 +73,24 @@ When importing incrementally, you might need to edit the .git/svn2git file.
 	syntaxes are similar enough that using the Subversion patterns
 	directly with "-I .gitignore" will almost always just work.)
 
+-A <author_file>::
+	Read a file with lines on the form
++
+------
+	username = User's Full Name <email@addr.es>
+
+------
++
+and use "User's Full Name <email@addr.es>" as the GIT
+author and committer for Subversion commits made by
+"username". If encountering a commit made by a user not in the
+list, abort.
++
+For convenience, this data is saved to $GIT_DIR/svn-authors
+each time the -A option is provided, and read from that same
+file each time git-svnimport is run with an existing GIT
+repository without -A.
+
 -m::
 	Attempt to detect merges based on the commit message. This option
 	will enable default regexes that try to capture the name source