From 36610b24f1a1821eee95243663631c1295c202ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20=20Hasselstr=C3=B6m?= <kha@treskal.com> Date: Sun, 26 Feb 2006 06:11:31 +0100 Subject: svnimport: Read author names and emails from a file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Read a file with lines on the form username User's Full Name <email@addres.org> and use "User's Full Name <email@addres.org>" 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. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net> --- Documentation/git-svnimport.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Documentation/git-svnimport.txt') diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index c95ff84f6a..e0e3a5d4e8 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -13,7 +13,8 @@ SYNOPSIS [ -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 @@ -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 <author_file>:: + Read a file with lines on the form + + username User's Full Name <email@addres.org> + + and use "User's Full Name <email@addres.org>" 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 -- cgit v1.2.1