From: Junio C Hamano Date: Mon, 27 Feb 2006 07:07:08 +0000 (+0000) Subject: Autogenerated HTML docs for v1.2.2-gc55f X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=2abe7e860dae61000d304bc1e865406ddc7e4ba1 Autogenerated HTML docs for v1.2.2-gc55f --- diff --git a/git-svnimport.html b/git-svnimport.html index dcce0fa1..96876730 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -273,10 +273,10 @@ git-svnimport(1) Manual Page

SYNOPSIS

git-svnimport [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ] - [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev] - [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] - [ -s start_chg ] [ -m ] [ -M regex ] - <SVN_repository_URL> [ <path> ]

+ [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev] + [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] + [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] + [ -I <ignorefile_name> ] <SVN_repository_URL> [ <path> ]

DESCRIPTION

@@ -365,6 +365,17 @@ incremental SVN imports.

+-I <ignorefile_name> +
+
+

+ Import the svn:ignore directory property to files with this + name in each directory. (The Subversion and GIT ignore + syntaxes are similar enough that using the Subversion patterns + directly with "-I .gitignore" will almost always just work.) +

+
+
-m
@@ -478,7 +489,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index 5c543d5d..c95ff84f 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -10,10 +10,10 @@ git-svnimport - Import a SVN repository into git SYNOPSIS -------- 'git-svnimport' [ -o ] [ -h ] [ -v ] [ -d | -D ] - [ -C ] [ -i ] [ -u ] [-l limit_rev] - [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] - [ -s start_chg ] [ -m ] [ -M regex ] - [ ] + [ -C ] [ -i ] [ -u ] [-l limit_rev] + [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] + [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] + [ -I ] [ ] DESCRIPTION @@ -65,6 +65,12 @@ When importing incrementally, you might need to edit the .git/svn2git file. Prepend 'rX: ' to commit messages, where X is the imported subversion revision. +-I :: + Import the svn:ignore directory property to files with this + name in each directory. (The Subversion and GIT ignore + syntaxes are similar enough that using the Subversion patterns + directly with "-I .gitignore" will almost always just work.) + -m:: Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the name source