From a725a53a1bd7c9e733b42b9a8707f4255a3e4654 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Mar 2006 08:33:47 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.2.4-gac74 --- git-cvsimport.html | 30 +++++++++++------------------- git-cvsimport.txt | 27 +++++++++++++++------------ git-svnimport.html | 21 ++++++++------------- git-svnimport.txt | 25 ++++++++++++++----------- 4 files changed, 48 insertions(+), 55 deletions(-) diff --git a/git-cvsimport.html b/git-cvsimport.html index 2f22c308..dcae53b7 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -439,29 +439,21 @@ the old cvs2git tool.

commit logs. Using this option and an author-conv-file in this format

-
+
-
exon=Andreas Ericsson <ae@op5.se>
-spawn=Simon Pawn <spawn@frog-pond.org>
+
        exon=Andreas Ericsson <ae@op5.se>
+        spawn=Simon Pawn <spawn@frog-pond.org>
+
-
-
-
git-cvsimport will make it appear as those authors had
+
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
+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
+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-link[1]::git-cvsexportcommit.

@@ -486,7 +478,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 57027b44..b0c6d7c3 100644 --- a/git-cvsimport.txt +++ b/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/git-svnimport.html b/git-svnimport.html index 3ccba374..ea04c0fe 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -384,24 +384,19 @@ incremental SVN imports.

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
+
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
+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.
-
+repository without -A.

-m @@ -517,7 +512,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index 9d386571..b1b87c2f 100644 --- a/git-svnimport.txt +++ b/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