summaryrefslogtreecommitdiff
path: root/Documentation/git-svnimport.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-svnimport.txt')
-rw-r--r--Documentation/git-svnimport.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index a27a835..88bdc08 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
-------
@@ -49,27 +49,27 @@ When importing incementally, you might need to edit the .git/svn2git file.
-t <trunk_subdir>::
Name the SVN trunk. Default "trunk".
-
+
-T <tag_subdir>::
Name the SVN subdirectory for tags. Default "tags".
-
+
-b <branch_subdir>::
Name the SVN subdirectory for branches. Default "branches".
-
+
-o <branch-for-HEAD>::
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 <regex>::
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 <max_num_changes>::
Limit the number of SVN changesets we pull before quitting.