diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:24:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:24:09 -0800 |
| commit | a2055c28eefd1bc2bb4997276d809ee3d3436a50 (patch) | |
| tree | 0731dcefa04a916d7fb9ba70caef3ee834dda084 /Documentation | |
| parent | 6b8731258d06001217254ef67a3553d3fe601737 (diff) | |
| parent | c2b3af0537e0b2c7624913b0f26191e992beb12c (diff) | |
| download | git-a2055c28eefd1bc2bb4997276d809ee3d3436a50.tar.gz git-a2055c28eefd1bc2bb4997276d809ee3d3436a50.tar.xz | |
Merge branch 'cr/cvsimport-local-zone'
Allows "cvsimport" to read per-author timezone from the author info
file.
* cr/cvsimport-local-zone:
cvsimport: work around perl tzset issue
git-cvsimport: allow author-specific timezones
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cvsimport.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 6695ab3b4..98d9881d7 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -137,17 +137,19 @@ This option can be used several times to provide several detection regexes. -A <author-conv-file>:: 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 <ae@op5.se> - spawn=Simon Pawn <spawn@frog-pond.org> + spawn=Simon Pawn <spawn@frog-pond.org> 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 |