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 <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>
11

DESCRIPTION

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

OPTIONS

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

CONFIGURATION

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

EXAMPLES

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

GIT

104       Part of the git(1) suite
105
106
107
108Git 2.39.1                        2023-01-13            GIT-CVSEXPORTCOMMIT(1)
Impressum