From 2e55244900430cd15c5db485db1839ad8c50aceb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 Jan 2006 23:39:30 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.1.6-g1506 --- git-cvsexportcommit.html | 33 +++++++++++++++++++++++++++++++-- git-cvsexportcommit.txt | 21 +++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index ecaa05b3..a860342b 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -278,7 +278,8 @@ git-cvsexportcommit(1) Manual Page

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.

+

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.

@@ -317,6 +318,34 @@ should the changeset be done against.

+

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>

@@ -331,7 +360,7 @@ should the changeset be done against.

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 13cbf3ba..d30435a9 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 +$ cvs commit -F .mgs +------------ + +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 -- 2.11.0