path: root/Documentation
diff options
authorJunio C Hamano <>2006-03-02 05:46:01 (GMT)
committerJunio C Hamano <>2006-03-02 05:46:01 (GMT)
commit5343cf1082c93e41515acbc36a4a9c8c5995d4ac (patch)
treec4a4b0e059343df236efd21aca9f86484fc180d7 /Documentation
parentb6b626fad7463940dcba6fab879cbe72dce0d36a (diff)
parentd3cac2c95a1600c9269c821153cbad681b66a8d2 (diff)
Merge branch 'kh/svnimport'
* kh/svnimport: Save username -> Full Name <> map file
Diffstat (limited to 'Documentation')
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.
Attempt to detect merges based on the commit message. This option
will enable default regexes that try to capture the name source