summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorKarl Hasselström <kha@treskal.com>2006-02-27 23:08:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-27 23:27:24 (GMT)
commitd3cac2c95a1600c9269c821153cbad681b66a8d2 (patch)
tree1a4b4c517eab764cd6bd213aa4fc6946179912fa /Documentation
parent80804d0af8f5bfa8ce87b5ef72cd2c5eb64c8f40 (diff)
downloadgit-d3cac2c95a1600c9269c821153cbad681b66a8d2.zip
git-d3cac2c95a1600c9269c821153cbad681b66a8d2.tar.gz
git-d3cac2c95a1600c9269c821153cbad681b66a8d2.tar.bz2
Save username -> Full Name <email@addr.es> map file
When the user specifies a username -> Full Name <email@addr.es> map file with the -A option, save a copy of that file as $git_dir/svn-authors. When running git-svnimport with an existing GIT directory, use $git_dir/svn-authors (if it exists) unless a file was explicitly specified with -A. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-svnimport.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 912a808..a158813 100644
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -82,6 +82,11 @@ When importing incrementally, you might need to edit the .git/svn2git file.
"username". If encountering a commit made by a user not in the
list, abort.
+ For convenience, this data is saved to $GIT_DIR/svn-authors
+ each time the -A option is provided, and read from that same
+ file each time git-svnimport is run with an existing GIT
+ repository without -A.
+
-m::
Attempt to detect merges based on the commit message. This option
will enable default regexes that try to capture the name source