1GIT-CVSEXPORTCOMMIT(1)            Git Manual            GIT-CVSEXPORTCOMMIT(1)
2
3
4

NAME

6       git-cvsexportcommit - Export a single commit to a CVS checkout
7

SYNOPSIS

9       git cvsexportcommit [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
10               [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
11
12

DESCRIPTION

14       Exports a commit from Git to a CVS checkout, making it easier to merge
15       patches from a Git repository into a CVS repository.
16
17       Specify the name of a CVS checkout using the -w switch or execute it
18       from the root of the CVS working copy. In the latter case GIT_DIR must
19       be defined. See examples below.
20
21       It does its best to do the safe thing, it will check that the files are
22       unchanged and up to date in the CVS checkout, and it will not
23       autocommit by default.
24
25       Supports file additions, removals, and commits that affect binary
26       files.
27
28       If the commit is a merge commit, you must tell git cvsexportcommit what
29       parent the changeset should be done against.
30

OPTIONS

32       -c
33           Commit automatically if the patch applied cleanly. It will not
34           commit if any hunks fail to apply or there were other problems.
35
36       -p
37           Be pedantic (paranoid) when applying patches. Invokes patch with
38           --fuzz=0
39
40       -a
41           Add authorship information. Adds Author line, and Committer (if
42           different from Author) to the message.
43
44       -d
45           Set an alternative CVSROOT to use. This corresponds to the CVS -d
46           parameter. Usually users will not want to set this, except if using
47           CVS in an asymmetric fashion.
48
49       -f
50           Force the merge even if the files are not up to date.
51
52       -P
53           Force the parent commit, even if it is not a direct parent.
54
55       -m
56           Prepend the commit message with the provided prefix. Useful for
57           patch series and the like.
58
59       -u
60           Update affected files from CVS repository before attempting export.
61
62       -k
63           Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ becomes
64           $Revision$) in working CVS checkout before applying patch.
65
66       -w
67           Specify the location of the CVS checkout to use for the export.
68           This option does not require GIT_DIR to be set before execution if
69           the current directory is within a Git repository. The default is
70           the value of cvsexportcommit.cvsdir.
71
72       -W
73           Tell cvsexportcommit that the current working directory is not only
74           a Git checkout, but also the CVS checkout. Therefore, Git will
75           reset the working directory to the parent commit before proceeding.
76
77       -v
78           Verbose.
79

CONFIGURATION

81       cvsexportcommit.cvsdir
82           The default location of the CVS checkout to use for the export.
83

EXAMPLES

85       Merge one patch into CVS
86
87               $ export GIT_DIR=~/project/.git
88               $ cd ~/project_cvs_checkout
89               $ git cvsexportcommit -v <commit-sha1>
90               $ cvs commit -F .msg <files>
91
92
93       Merge one patch into CVS (-c and -w options). The working directory is
94       within the Git Repo
95
96                       $ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>
97
98
99       Merge pending patches into CVS automatically — only if you really know
100       what you are doing
101
102               $ export GIT_DIR=~/project/.git
103               $ cd ~/project_cvs_checkout
104               $ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v
105
106

GIT

108       Part of the git(1) suite
109
110
111
112Git 1.8.3.1                       11/19/2018            GIT-CVSEXPORTCOMMIT(1)