Merge branch 'jc/fsck' into next

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 912a80865e7616fc81905616f9b9f86c531ff4ce..9d3865719c37b9cef435b6a5b77afe3ff9aa7b40 100644 (file)
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt
@@ -9,6 +9,7 @@ git-svnimport - Import a SVN repository into git
 
 SYNOPSIS
 --------
+[verse]
 'git-svnimport' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d | -D ]
                [ -C <GIT_repository> ] [ -i ] [ -u ] [-l limit_rev]
                [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ]
@@ -82,6 +83,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