X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-svnimport.txt;h=fcc79fa93a18444e5df42bc9e98bb18fe4b55ce5;hb=2c4ed386e8861e730037abe4f4d9e032c5c46242;hp=a27a83596c05e519ff36e65e760f6b8041852af7;hpb=25f6f325d7a8f7cb686a9ffd9fa2c00b3aa85a60;p=git.git diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index a27a8359..fcc79fa9 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -29,7 +29,7 @@ directories for branches, and "/tags/FOO" directories for tags. Other subdirectories are ignored. git-svnimport creates a file ".git/svn2git", which is required for -incremental SVN imports. +incremental SVN imports. OPTIONS ------- @@ -44,32 +44,32 @@ When importing incementally, you might need to edit the .git/svn2git file. -i:: Import-only: don't perform a checkout after importing. This option - ensures the working directory and cache remain untouched and will + ensures the working directory and index remain untouched and will not create them if they do not exist. -t :: Name the SVN trunk. Default "trunk". - + -T :: Name the SVN subdirectory for tags. Default "tags". - + -b :: Name the SVN subdirectory for branches. Default "branches". - + -o :: The 'trunk' branch from SVN is imported to the 'origin' branch within the git repository. Use this option if you want to import into a different branch. --m:: +-m:: Attempt to detect merges based on the commit message. This option - will enable default regexes that try to capture the name source - branch name from the commit message. + will enable default regexes that try to capture the name source + branch name from the commit message. -M :: Attempt to detect merges based on the commit message with a custom - regex. It can be used with -m to also see the default regexes. - You must escape forward slashes. + regex. It can be used with -m to also see the default regexes. + You must escape forward slashes. -l :: Limit the number of SVN changesets we pull before quitting.