summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsimport.txt
diff options
context:
space:
mode:
authorMatthias Urlichs <smurf@smurf.noris.de>2006-03-07 09:08:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-08 01:00:45 (GMT)
commita541211ef4136eb7464c4466d20b60b8580efc44 (patch)
tree2fbc96fdd90494f9bbc054880794440ac2613b1a /Documentation/git-cvsimport.txt
parent2dcdb4c69737185f0b0e9fe08ba52b95b84f13da (diff)
downloadgit-a541211ef4136eb7464c4466d20b60b8580efc44.zip
git-a541211ef4136eb7464c4466d20b60b8580efc44.tar.gz
git-a541211ef4136eb7464c4466d20b60b8580efc44.tar.bz2
cvsimport: Remove master-updating code
The code which tried to update the master branch was somewhat broken. => People should do that manually, with "git merge". Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cvsimport.txt')
-rw-r--r--Documentation/git-cvsimport.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index dfe86ce..57027b4 100644
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -22,6 +22,12 @@ repository, or incrementally import into an existing one.
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
+"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.
+
OPTIONS
-------
-d <CVSROOT>::