diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-01-29 23:39:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-01-29 23:39:30 -0800 |
| commit | 2e55244900430cd15c5db485db1839ad8c50aceb (patch) | |
| tree | 72a78c6af494b38bcfa62b16b3b7708e0e470039 /git-cvsexportcommit.txt | |
| parent | 560a1f6414df207911062a54e3f8a6c0f0721195 (diff) | |
| download | git-htmldocs-2e55244900430cd15c5db485db1839ad8c50aceb.tar.gz | |
Autogenerated HTML docs for v1.1.6-g1506
Diffstat (limited to 'git-cvsexportcommit.txt')
| -rw-r--r-- | git-cvsexportcommit.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 13cbf3ba6..d30435a9e 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -17,6 +17,7 @@ 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 @@ -41,6 +42,26 @@ OPTIONS -v:: Verbose. +EXAMPLES +-------- + +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 +------------ + Author ------ Written by Martin Langhoff <martin@catalyst.net.nz> |