From: Junio C Hamano Date: Mon, 28 Jan 2013 19:09:37 +0000 (-0800) Subject: Merge branch 'er/stop-recommending-parsecvs' into maint X-Git-Tag: v1.8.1.2~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78?hp=-c Merge branch 'er/stop-recommending-parsecvs' into maint * er/stop-recommending-parsecvs: Remove the suggestion to use parsecvs, which is currently broken. --- 3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78 diff --combined Documentation/git-cvsimport.txt index 98d9881d7e,70fab09f6c..9d5353e8be --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@@ -137,19 -137,17 +137,19 @@@ This option can be used several times t -A :: CVS by default uses the Unix username when writing its commit logs. Using this option and an author-conv-file - in this format + maps the name recorded in CVS to author name, e-mail and + optional timezone: + --------- exon=Andreas Ericsson - spawn=Simon Pawn + spawn=Simon Pawn America/Chicago --------- + 'git cvsimport' will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly -all along. +all along. If a timezone is specified, GIT_AUTHOR_DATE will +have the corresponding offset applied. + For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same @@@ -213,11 -211,9 +213,9 @@@ Problems related to tags * Multiple tags on the same revision are not imported. If you suspect that any of these issues may apply to the repository you - want to import consider using these alternative tools which proved to be - more stable in practice: + want to imort, consider using cvs2git: - * cvs2git (part of cvs2svn), `http://cvs2svn.tigris.org` - * parsecvs, `http://cgit.freedesktop.org/~keithp/parsecvs` + * cvs2git (part of cvs2svn), `http://subversion.apache.org/` GIT ---