Merge branch 'master' into next

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 912a80865e7616fc81905616f9b9f86c531ff4ce..a1588138ea5887e9aa785a21481cc29e790f6dab 100644 (file)
--- 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