From: Junio C Hamano Date: Tue, 21 Mar 2006 08:33:54 +0000 (+0000) Subject: Autogenerated man pages for v1.2.4-gac74 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffc7dd363872826e7cafe9adc6bfb3239f1382d3;p=git.git Autogenerated man pages for v1.2.4-gac74 --- diff --git a/man1/git-cvsimport.1 b/man1/git-cvsimport.1 index 204702eb6..87c2311d5 100755 --- a/man1/git-cvsimport.1 +++ b/man1/git-cvsimport.1 @@ -109,28 +109,17 @@ Substitute the character "/" in branch names with \-A CVS by default uses the unix username when writing its commit logs\&. Using this option and an author\-conv\-file in this format -.nf -exon=Andreas Ericsson -spawn=Simon Pawn -.fi .nf -git\-cvsimport will make it appear as those authors had -their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly -all along\&. -.fi + exon=Andreas Ericsson + spawn=Simon Pawn -.nf -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\&. .fi +git\-cvsimport will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along\&. -.nf -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\&. -.fi +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\&. .SH "OUTPUT" diff --git a/man1/git-svnimport.1 b/man1/git-svnimport.1 index b86b8f46a..44e91f30f 100755 --- a/man1/git-svnimport.1 +++ b/man1/git-svnimport.1 @@ -89,23 +89,14 @@ Import the svn:ignore directory property to files with this name in each directo \-A Read a file with lines on the form -.nf -username = User's Full Name -.fi .nf -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\&. -.fi + username = User's Full Name -.nf -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\&. .fi +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\&. .TP \-m