undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsexportcommit: add some examples to the documentation

Browse Source 
Updated with Randall Schwartz's suggestion.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Martin Langhoff 2006-01-30 19:34:15 +13:00 committed by Junio C Hamano
parent d41df15e69
commit 1506fc34f7
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Documentation/git-cvsexportcommit.txt
View File

@ -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. 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. 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 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 unchanged and up to date in the CVS checkout, and it will not autocommit
@ -41,6 +42,26 @@ OPTIONS
-v:: -v::
Verbose. 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 Author
------ ------
Written by Martin Langhoff <martin@catalyst.net.nz> Written by Martin Langhoff <martin@catalyst.net.nz>