From 96ed04d9d9d6c176a3691a4713da2e96adefd982 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 29 Jan 2006 23:39:40 -0800 Subject: [PATCH] Autogenerated man pages for v1.1.6-g1506 --- man1/git-cvsexportcommit.1 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index 3c50de07..fa851158 100755 --- a/man1/git-cvsexportcommit.1 +++ b/man1/git-cvsexportcommit.1 @@ -31,7 +31,7 @@ git\-cvsexportcommmit [\-h] [\-v] [\-c] [\-p] [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\&. +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\&. @@ -56,6 +56,23 @@ Be pedantic (paranoid) when applying patches\&. Invokes patch with \-\-fuzz=0 \-v Verbose\&. +.SH "EXAMPLES" + +.TP +Merge one patch into CVS + +.IP +$ export GIT_DIR=~/project/\&.git +$ cd ~/project_cvs_checkout +$ git\-cvsexportcommit \-v +$ cvs commit \-F \&.mgs +.TP +Merge pending patches into CVS automatically -- only if you really know what you are doing + +.IP +$ export GIT_DIR=~/project/\&.git +$ cd ~/project_cvs_checkout +$ git\-cherry cvshead myhead | sed \-n 's/^+ //p' | xargs \-l1 git\-cvsexportcommit \-c \-p \-v .SH "AUTHOR" -- 2.11.0