X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-svnimport.txt;h=b1b87c2fcd9b60aef6fb937bd4d28572f1cb8463;hb=fd7e9fb7ae206a64b87c7faecfc88716e98a7577;hp=9d3865719c37b9cef435b6a5b77afe3ff9aa7b40;hpb=1c7fee5d0857d809fe5d93a1d56968e44296ce55;p=git.git diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index 9d386571..b1b87c2f 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -75,18 +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. - - 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. +------ ++ +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