diff options
| author | Alex Bennée <kernel-hacker@bennee.com> | 2009-06-16 15:21:04 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-18 10:19:50 -0700 |
| commit | 907ffe1522560ba71991ae4d2b03e357a8f57110 (patch) | |
| tree | e5d0af32ed784c188accab16a651267b873fb0b5 /Documentation/git-cvsexportcommit.txt | |
| parent | 4f4fa9c228a1ac2854c0814b5b23df43b8d98203 (diff) | |
| download | git-907ffe1522560ba71991ae4d2b03e357a8f57110.tar.gz | |
Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
Depending on how your CVS->GIT conversion went you will have some
unexpanded CVS keywords in your GIT repo. If any of your git commits
touch these lines then the patch application will fail. This patch
addresses that by adding an option that will revert and expanded CVS
keywords to files in the working CVS directory that are affected by
the commit being applied.
Signed-off-by: Alex Bennée <alex@bennee.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cvsexportcommit.txt')
| -rw-r--r-- | Documentation/git-cvsexportcommit.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index 2da8588f4f..abaaf273bb 100644 --- a/Documentation/git-cvsexportcommit.txt +++ b/Documentation/git-cvsexportcommit.txt @@ -63,6 +63,10 @@ OPTIONS -u:: Update affected files from CVS repository before attempting export. +-k:: + Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ + becomes $Revision$) in working CVS checkout before applying patch. + -w:: Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the |