X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-svnimport.txt;h=b1b87c2fcd9b60aef6fb937bd4d28572f1cb8463;hb=HEAD;hp=912a80865e7616fc81905616f9b9f86c531ff4ce;hpb=6be65bbc958e8d7c57bc81ae7035119b8b1afbab;p=git.git diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index 912a8086..b1b87c2f 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -9,6 +9,7 @@ git-svnimport - Import a SVN repository into git SYNOPSIS -------- +[verse] 'git-svnimport' [ -o ] [ -h ] [ -v ] [ -d | -D ] [ -C ] [ -i ] [ -u ] [-l limit_rev] [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] @@ -74,13 +75,21 @@ 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 - author and committer for Subversion commits made by - "username". If encountering a commit made by a user not in the - list, abort. +------ ++ +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