X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-cvsimport.txt;h=d21d66bfebe368c034afdabf79e8f143813e619d;hb=71c87795c3f724a88c2f1f95aa21f212efc69b66;hp=57027b448f52a1357d89b569f5b94c8a928f7f56;hpb=64ecb6247f89783a53297436fa452478a83bda53;p=git.git diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 57027b448..d21d66bfe 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 +gitlink:git-cvsexportcommit[1]. OUTPUT ------