From 3070b603ab349674fd357b1b7f9ba4698f2b86b7 Mon Sep 17 00:00:00 2001 From: Francis Daly Date: Mon, 20 Mar 2006 10:41:18 +0000 Subject: [PATCH] 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 Read a file with lines on the form username = User's Full Name and use "User's Full Name " as the GIT With this patch, docbook-xsl v1.68 looks like -A Read a file with lines on the form username = User's Full Name and use "User's Full Name " as the GIT author and while docbook-xsl v1.69 becomes -A Read a file with lines on the form username = User's Full Name and use "User's Full Name " as the GIT author and The extra indentation is to keep the v1.69 manpage looking sane. --- Documentation/git-cvsimport.txt | 27 +++++++++++++++------------ Documentation/git-svnimport.txt | 25 ++++++++++++++----------- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 57027b44..b0c6d7c3 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -99,21 +99,24 @@ If you need to pass multiple options, separate them with a comma. CVS by default uses the unix username when writing its commit logs. Using this option and an author-conv-file in this format - ++ +--------- exon=Andreas Ericsson spawn=Simon Pawn - git-cvsimport will make it appear as those authors had - their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly - all along. - - For convenience, this data is saved to $GIT_DIR/cvs-authors - each time the -A option is provided and read from that same - file each time git-cvsimport is run. - - It is not recommended to use this feature if you intend to - export changes back to CVS again later with - git-link[1]::git-cvsexportcommit. +--------- ++ +git-cvsimport will make it appear as those authors had +their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly +all along. ++ +For convenience, this data is saved to $GIT_DIR/cvs-authors +each time the -A option is provided and read from that same +file each time git-cvsimport is run. ++ +It is not recommended to use this feature if you intend to +export changes back to CVS again later with +git-link[1]::git-cvsexportcommit. OUTPUT ------ diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt index 9d386571..b1b87c2f 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 :: Read a file with lines on the form ++ +------ + username = User's Full Name - username = User's Full Name - - and use "User's Full Name " 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 " 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 -- 2.11.0