summaryrefslogtreecommitdiff
path: root/Documentation/git-svnimport.txt
diff options
context:
space:
mode:
authorKarl Hasselström <kha@treskal.com>2006-02-26 05:11:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-27 05:34:42 (GMT)
commit36610b24f1a1821eee95243663631c1295c202ed (patch)
tree50e5cb434d7a306c233c0733973597559ad31252 /Documentation/git-svnimport.txt
parentc55f3fff35ac34e6d1f0f686e27029612775e51d (diff)
downloadgit-36610b24f1a1821eee95243663631c1295c202ed.zip
git-36610b24f1a1821eee95243663631c1295c202ed.tar.gz
git-36610b24f1a1821eee95243663631c1295c202ed.tar.bz2
svnimport: Read author names and emails from a 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. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-svnimport.txt')
-rw-r--r--Documentation/git-svnimport.txt13
1 files changed, 12 insertions, 1 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index c95ff84..e0e3a5d 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