aboutsummaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-05-14 15:29:49 +0100
committerJunio C Hamano <gitster@pobox.com>2008-05-15 16:52:31 -0700
commitd775734c40afed216160437c59a45c93bdf28689 (patch)
tree9767b442e6052ca8a1981d9ef8d710c1adb2116e /xdiff
parent57e0e3ebd6fac2bf5fe46fd946dae6129b07f474 (diff)
downloadgit-d775734c40afed216160437c59a45c93bdf28689.tar.gz
git-d775734c40afed216160437c59a45c93bdf28689.tar.xz
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>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions