author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
Wed, 14 May 2008 14:29:49 +0000 (15:29 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 15 May 2008 23:52:31 +0000 (16:52 -0700) | ||
commit | d775734c40afed216160437c59a45c93bdf28689 | |
tree | 9767b442e6052ca8a1981d9ef8d710c1adb2116e | tree | snapshot |
parent | 57e0e3ebd6fac2bf5fe46fd946dae6129b07f474 | commit | diff |
cvsexportcommit: introduce -W for shared working trees (between Git and CVS)
If you have a CVS checkout, it is easy to import the CVS history by
calling "git cvsimport". However, interacting with the CVS repository
using "git cvsexportcommit" was cumbersome, since that script assumes
separate working directories for Git and CVS.
Now, you can call cvsexportcommit with the -W option. This will
automatically discover the GIT_DIR, and it will check out the parent
commit before exporting the commit.
The intended workflow is this:
$ CVSROOT=$URL cvs co module
$ cd module
$ git cvsimport
hack, hack, hack, making two commits, cleaning them up using rebase -i.
$ git cvsexportcommit -W -c -p -u HEAD^
$ git cvsexportcommit -W -c -p -u HEAD
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If you have a CVS checkout, it is easy to import the CVS history by
calling "git cvsimport". However, interacting with the CVS repository
using "git cvsexportcommit" was cumbersome, since that script assumes
separate working directories for Git and CVS.
Now, you can call cvsexportcommit with the -W option. This will
automatically discover the GIT_DIR, and it will check out the parent
commit before exporting the commit.
The intended workflow is this:
$ CVSROOT=$URL cvs co module
$ cd module
$ git cvsimport
hack, hack, hack, making two commits, cleaning them up using rebase -i.
$ git cvsexportcommit -W -c -p -u HEAD^
$ git cvsexportcommit -W -c -p -u HEAD
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-cvsexportcommit.txt | diff | blob | history | |
git-cvsexportcommit.perl | diff | blob | history | |
t/t9200-git-cvsexportcommit.sh | diff | blob | history |