From 2810e9eed91c429686039ca61781492336ca9410 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 14 May 2006 09:22:55 +0000 Subject: [PATCH] Autogenerated man pages for v1.3.2-g5f7f2 --- man1/git-cvsexportcommit.1 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/man1/git-cvsexportcommit.1 b/man1/git-cvsexportcommit.1 index fa851158d..e17094cd6 100755 --- a/man1/git-cvsexportcommit.1 +++ b/man1/git-cvsexportcommit.1 @@ -23,7 +23,7 @@ git-cvsexportcommit \- Export a commit to a CVS checkout .SH "SYNOPSIS" -git\-cvsexportcommmit [\-h] [\-v] [\-c] [\-p] [PARENTCOMMIT] COMMITID +\fIgit\-cvsexportcommmit\fR [\-h] [\-v] [\-c] [\-p] [\-f] [\-m msgprefix] [PARENTCOMMIT] COMMITID .SH "DESCRIPTION" @@ -52,6 +52,14 @@ Commit automatically if the patch applied cleanly\&. It will not commit if any h \-p Be pedantic (paranoid) when applying patches\&. Invokes patch with \-\-fuzz=0 +.TP +\-f +Force the merge even if the files are not up to date\&. + +.TP +\-m +Prepend the commit message with the provided prefix\&. Useful for patch series and the like\&. + .TP \-v Verbose\&. @@ -61,18 +69,22 @@ Verbose\&. .TP Merge one patch into CVS -.IP +.nf $ export GIT_DIR=~/project/\&.git $ cd ~/project_cvs_checkout $ git\-cvsexportcommit \-v $ cvs commit \-F \&.mgs +.fi + .TP Merge pending patches into CVS automatically -- only if you really know what you are doing -.IP +.nf $ export GIT_DIR=~/project/\&.git $ cd ~/project_cvs_checkout $ git\-cherry cvshead myhead | sed \-n 's/^+ //p' | xargs \-l1 git\-cvsexportcommit \-c \-p \-v +.fi + .SH "AUTHOR" -- 2.26.2