Merge branch 'jc/empty' into next

diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index e0e3a5d4e8aa9dce8be88e33606c878e8bb18403..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 ]
@@ -75,13 +76,18 @@ 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.
 
+       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