diff options
| author | Francis Daly <francis@daoine.org> | 2006-03-20 10:41:18 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-20 14:37:33 -0800 |
| commit | 3070b603ab349674fd357b1b7f9ba4698f2b86b7 (patch) | |
| tree | 7d4c10566e018bd9d686991742960ae09bc717dd /Documentation/git-svnimport.txt | |
| parent | bb52807916598301e670963e6cc5f1f5cdca3ad7 (diff) | |
| download | git-3070b603ab349674fd357b1b7f9ba4698f2b86b7.tar.gz git-3070b603ab349674fd357b1b7f9ba4698f2b86b7.tar.xz | |
Fix multi-paragraph list items in OPTIONS section
This patch makes the html docs right, makes the asciidoc docs a bit odd
but consistent with what is there already, and makes the manpages look
OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69.
For the manpages, current is like
-A <author_file>
Read a file with lines on the form
username = User's Full Name <email@addr.es>
and use "User's Full Name <email@addr.es>" as the GIT
With this patch, docbook-xsl v1.68 looks like
-A <author_file>
Read a file with lines on the form
username = User's Full Name <email@addr.es>
and use "User's Full Name <email@addr.es>" as the GIT author and
while docbook-xsl v1.69 becomes
-A <author_file>
Read a file with lines on the form
username = User's Full Name <email@addr.es>
and use "User's Full Name <email@addr.es>" as the GIT author and
The extra indentation is to keep the v1.69 manpage looking sane.
Diffstat (limited to 'Documentation/git-svnimport.txt')
| -rw-r--r-- | Documentation/git-svnimport.txt | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index 9d3865719..b1b87c2fc 100644 --- a/Documentation/git-svnimport.txt +++ b/Documentation/git-svnimport.txt @@ -75,18 +75,21 @@ 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@addr.es> - username = User's Full Name <email@addr.es> - - 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. +------ ++ +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 |