X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-svnimport.txt;h=a1588138ea5887e9aa785a21481cc29e790f6dab;hb=dcf7e417c6ae8d6a3ec06967bf87aadd34dbeb72;hp=e0e3a5d4e8aa9dce8be88e33606c878e8bb18403;hpb=36610b24f1a1821eee95243663631c1295c202ed;p=git.git diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index e0e3a5d4e..a1588138e 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -75,13 +75,18 @@ When importing incrementally, you might need to edit the .git/svn2git file. -A :: Read a file with lines on the form - username User's Full Name + username = User's Full Name - and use "User's Full Name " as the GIT + and use "User's Full Name " 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