blob: 092d0d6730294a5ce701522575bc1f8d91755a1d [file] [log] [blame]
git-cvsexportcommit - Export a commit to a CVS checkout
'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
Exports a commit from GIT to a CVS checkout, making it easier
to merge patches from a git repository into a CVS repository.
Execute it from the root of the CVS working copy. GIT_DIR must be defined.
See examples below.
It does its best to do the safe thing, it will check that the files are
unchanged and up to date in the CVS checkout, and it will not autocommit
by default.
Supports file additions, removals, and commits that affect binary files.
If the commit is a merge commit, you must tell git-cvsapplycommit what parent
should the changeset be done against.
Commit automatically if the patch applied cleanly. It will not
commit if any hunks fail to apply or there were other problems.
Be pedantic (paranoid) when applying patches. Invokes patch with
Add authorship information. Adds Author line, and Committer (if
different from Author) to the message.
Force the merge even if the files are not up to date.
Prepend the commit message with the provided prefix.
Useful for patch series and the like.
Merge one patch into CVS::
$ export GIT_DIR=~/project/.git
$ cd ~/project_cvs_checkout
$ git-cvsexportcommit -v <commit-sha1>
$ cvs commit -F .mgs <files>
Merge pending patches into CVS automatically -- only if you really know what you are doing ::
$ export GIT_DIR=~/project/.git
$ cd ~/project_cvs_checkout
$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v
Written by Martin Langhoff <>
Documentation by Martin Langhoff <>
Part of the gitlink:git[7] suite