diff options
| author |  Martin Langhoff <martin@ng.eduforge.org> | 2005-08-16 17:39:29 +1200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-08-16 12:09:33 -0700 |
| commit | abe0582207c72ec848e78707577c61a98f5c633d (patch) | |
| tree | b00f462cee5b02455abdbb476fa7c9e94a9fcb4c /Documentation/git-cvsimport-script.txt | |
| parent | [PATCH] Fix local pull that uses packs. (diff) | |
| download | tgif-abe0582207c72ec848e78707577c61a98f5c633d.tar.xz | |
[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised
Early versions of git-cvsimport defaulted to using preexisting keyword
expansion settings. This change preserves compatibility with existing cvs
imports and allows new repository migrations to kill keyword expansion.
After exploration of the different -k modes in the cvs protocol, we use -kk
which kills keyword expansion wherever possible. Against the protocol
spec, -ko and -kb will sometimes expand keywords.
Should improve our chances of detecting merges and reduce imported
repository size.
Signed-off: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cvsimport-script.txt')
| -rw-r--r-- | Documentation/git-cvsimport-script.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt index 07b288f754..61713d859c 100644 --- a/Documentation/git-cvsimport-script.txt +++ b/Documentation/git-cvsimport-script.txt @@ -11,7 +11,7 @@ SYNOPSIS -------- 'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ] [ -d <CVSROOT> ] [ -p <options-for-cvsps> ] - [ -C <GIT_repository> ] [ -i ] [ <CVS_module> ] + [ -C <GIT_repository> ] [ -i ] [ -k ] [ <CVS_module> ] DESCRIPTION @@ -38,6 +38,11 @@ OPTIONS ensures the working directory and cache remain untouched and will not create them if they do not exist. +-k:: + Kill keywords: will extract files with -kk from the CVS archive + to avoid noisy changesets. Highly recommended, but off by default + to preserve compatibility with early imported trees. + -o <branch-for-HEAD>:: The 'HEAD' branch from CVS is imported to the 'origin' branch within the git repository, as 'HEAD' already has a special meaning for git. |