summaryrefslogtreecommitdiff
path: root/Documentation/git-svnimport.txt
diff options
context:
space:
mode:
authorKarl Hasselström <kha@treskal.com>2006-02-27 23:08:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-27 23:27:21 (GMT)
commit80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40 (patch)
tree5ca2f39c4cc5e006e28ea8c409c24467adf3a445 /Documentation/git-svnimport.txt
parent36610b24f1a1821eee95243663631c1295c202ed (diff)
downloadgit-80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40.zip
git-80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40.tar.gz
git-80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40.tar.bz2
Let git-svnimport's author file use same syntax as git-cvsimport's
git-cvsimport uses a username => Full Name <email@addr.es> mapping file with this syntax: kha=Karl Hasselström <kha@treskal.com> Since there is no reason to use another format for git-svnimport, use the same format. 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.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index e0e3a5d..912a808 100644
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -75,9 +75,9 @@ When importing incrementally, you might need to edit the .git/svn2git file.
-A <author_file>::
Read a file with lines on the form
- username User's Full Name <email@addres.org>
+ username = User's Full Name <email@addr.es>
- and use "User's Full Name <email@addres.org>" as the GIT
+ 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.