From 93b02f2eb4250ef2aaac579e763b98efce382bf1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 28 Feb 2006 00:09:58 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.2.2-gf3a4 --- git-svnimport.html | 24 ++++++++++++++++++++++-- git-svnimport.txt | 13 ++++++++++++- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/git-svnimport.html b/git-svnimport.html index 96876730..fa318704 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -276,7 +276,8 @@ git-svnimport(1) Manual Page [ -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> ]

+ [ -I <ignorefile_name> ] [ -A <author_file> ] + <SVN_repository_URL> [ <path> ]

DESCRIPTION

@@ -376,6 +377,25 @@ incremental SVN imports.

+-A <author_file> +
+
+

+ Read a file with lines on the form +

+
+
+
username = User's Full Name <email@addr.es>
+
+
+
+
and use "User's Full Name <email@addr.es>" 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.
+
+
+
-m
@@ -489,7 +509,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index c95ff84f..912a8086 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -13,7 +13,8 @@ SYNOPSIS [ -C ] [ -i ] [ -u ] [-l limit_rev] [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] - [ -I ] [ ] + [ -I ] [ -A ] + [ ] DESCRIPTION @@ -71,6 +72,16 @@ When importing incrementally, you might need to edit the .git/svn2git file. syntaxes are similar enough that using the Subversion patterns directly with "-I .gitignore" will almost always just work.) +-A :: + Read a file with lines on the form + + 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. + -m:: Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the name source -- 2.11.0