Skip to content

Commit 1506fc3

Browse files
Martin LanghoffJunio C Hamano
authored andcommitted
cvsexportcommit: add some examples to the documentation
Updated with Randall Schwartz's suggestion. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent d41df15 commit 1506fc3

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

Documentation/git-cvsexportcommit.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Exports a commit from GIT to a CVS checkout, making it easier
1717
to merge patches from a git repository into a CVS repository.
1818

1919
Execute it from the root of the CVS working copy. GIT_DIR must be defined.
20+
See examples below.
2021

2122
It does its best to do the safe thing, it will check that the files are
2223
unchanged and up to date in the CVS checkout, and it will not autocommit
@@ -41,6 +42,26 @@ OPTIONS
4142
-v::
4243
Verbose.
4344

45+
EXAMPLES
46+
--------
47+
48+
Merge one patch into CVS::
49+
+
50+
------------
51+
$ export GIT_DIR=~/project/.git
52+
$ cd ~/project_cvs_checkout
53+
$ git-cvsexportcommit -v <commit-sha1>
54+
$ cvs commit -F .mgs <files>
55+
------------
56+
57+
Merge pending patches into CVS automatically -- only if you really know what you are doing ::
58+
+
59+
------------
60+
$ export GIT_DIR=~/project/.git
61+
$ cd ~/project_cvs_checkout
62+
$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v
63+
------------
64+
4465
Author
4566
------
4667
Written by Martin Langhoff <martin@catalyst.net.nz>

0 commit comments

Comments
 (0)