From cbc9be5ca3989e522f6ad0dfe3697657ecb4b595 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Mon, 4 Jun 2007 10:01:34 +0100 Subject: [PATCH] cvsimport: update documentation to include separate remotes option Document the cvsimport -r option which switches cvsimport to using a separate remote for tracking branches. Signed-off-by: Andy Whitcroft Signed-off-by: Junio C Hamano --- Documentation/git-cvsimport.txt | 23 +++++++++++++++++------ git-cvsimport.perl | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index e0be85654..4e5f1c6ba 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -13,7 +13,7 @@ SYNOPSIS [-A ] [-p ] [-P ] [-C ] [-z ] [-i] [-k] [-u] [-s ] [-a] [-m] [-M ] [-S ] [-L ] - [] + [-r ] [] DESCRIPTION @@ -25,10 +25,12 @@ Splitting the CVS log into patch sets is done by 'cvsps'. At least version 2.1 is required. You should *never* do any work of your own on the branches that are -created by git-cvsimport. The initial import will create and populate a +created by git-cvsimport. By default initial import will create and populate a "master" branch from the CVS repository's main branch which you're free to work with; after that, you need to 'git merge' incremental imports, or -any CVS branches, yourself. +any CVS branches, yourself. It is advisable to specify a named remote via +-r to separate and protect the incoming branches. + OPTIONS ------- @@ -51,10 +53,19 @@ OPTIONS The git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory. +-r :: + The git remote to import this CVS repository into. + Moves all CVS branches into remotes// + akin to the git-clone --use-separate-remote option. + -o :: - The 'HEAD' branch from CVS is imported to the 'origin' branch within - the git repository, as 'HEAD' already has a special meaning for git. - Use this option if you want to import into a different branch. + When no remote is specified (via -r) the 'HEAD' branch + from CVS is imported to the 'origin' branch within the git + repository, as 'HEAD' already has a special meaning for git. + When a remote is specified the 'HEAD' branch is named + remotes//master mirroring git-clone behaviour. + Use this option if you want to import into a different + branch. + Use '-o master' for continuing an import that was initially done by the old cvs2git tool. diff --git a/git-cvsimport.perl b/git-cvsimport.perl index f16ac3d8a..7837c7bfb 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -40,7 +40,7 @@ Usage: ${\basename $0} # fetch/update GIT from CVS [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file] [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k] [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit] - [CVS_module] + [-r remote] [CVS_module] END exit(1); } -- 2.30.2