git-cvsexportcommit(1) — Linux manual page



NAME         top

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

SYNOPSIS         top

       git cvsexportcommit [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]
               [-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>

DESCRIPTION         top

       Exports a commit from Git to a CVS checkout, making it easier to
       merge patches from a Git repository into a CVS repository.

       Specify the name of a CVS checkout using the -w switch or execute
       it from the root of the CVS working copy. In the latter case
       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.

       Supports file additions, removals, and commits that affect binary

       If the commit is a merge commit, you must tell git
       cvsexportcommit what parent the changeset should be done against.

OPTIONS         top

           Commit automatically if the patch applied cleanly. It will
           not commit if any hunks fail to apply or there were other

           Be pedantic (paranoid) when applying patches. Invokes patch
           with --fuzz=0

           Add authorship information. Adds Author line, and Committer
           (if different from Author) to the message.

           Set an alternative CVSROOT to use. This corresponds to the
           CVS -d parameter. Usually users will not want to set this,
           except if using CVS in an asymmetric fashion.

           Force the merge even if the files are not up to date.

           Force the parent commit, even if it is not a direct parent.

           Prepend the commit message with the provided prefix. Useful
           for patch series and the like.

           Update affected files from CVS repository before attempting

           Reverse CVS keyword expansion (e.g. $Revision:$
           becomes $Revision$) in working CVS checkout before applying

           Specify the location of the CVS checkout to use for the
           export. This option does not require GIT_DIR to be set before
           execution if the current directory is within a Git
           repository. The default is the value of

           Tell cvsexportcommit that the current working directory is
           not only a Git checkout, but also the CVS checkout.
           Therefore, Git will reset the working directory to the parent
           commit before proceeding.



           The default location of the CVS checkout to use for the

EXAMPLES         top

       Merge one patch into CVS

               $ export GIT_DIR=~/project/.git
               $ cd ~/project_cvs_checkout
               $ git cvsexportcommit -v <commit-sha1>
               $ cvs commit -F .msg <files>

       Merge one patch into CVS (-c and -w options). The working
       directory is within the Git Repo

                       $ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1>

       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

GIT         top

       Part of the git(1) suite

COLOPHON         top

       This page is part of the git (Git distributed version control
       system) project.  Information about the project can be found at
       ⟨⟩.  If you have a bug report for this manual
       page, see ⟨⟩.  This page was obtained
       from the project's upstream Git repository
       ⟨⟩ on 2023-12-22.  (At that time,
       the date of the most recent commit that was found in the
       repository was 2023-12-20.)  If you discover any rendering
       problems in this HTML version of the page, or you believe there
       is a better or more up-to-date source for the page, or you have
       corrections or improvements to the information in this COLOPHON
       (which is not part of the original manual page), send a mail to

Git         2023-12-20         GIT-CVSEXPORTCOMMIT(1)

Pages that refer to this page: git(1)