1git-cvsexportcommit(1) 2====================== 3 4NAME 5---- 6git-cvsexportcommit - Export a single commit to a CVS checkout 7 8 9SYNOPSIS 10-------- 11[verse] 12'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] 13 [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID 14 15 16DESCRIPTION 17----------- 18Exports a commit from GIT to a CVS checkout, making it easier 19to merge patches from a git repository into a CVS repository. 20 21Specify the name of a CVS checkout using the -w switch or execute it 22from the root of the CVS working copy. In the latter case GIT_DIR must 23be defined. See examples below. 24 25It does its best to do the safe thing, it will check that the files are 26unchanged and up to date in the CVS checkout, and it will not autocommit 27by default. 28 29Supports file additions, removals, and commits that affect binary files. 30 31If the commit is a merge commit, you must tell 'git cvsexportcommit' what 32parent the changeset should be done against. 33 34OPTIONS 35------- 36 37-c:: 38 Commit automatically if the patch applied cleanly. It will not 39 commit if any hunks fail to apply or there were other problems. 40 41-p:: 42 Be pedantic (paranoid) when applying patches. Invokes patch with 43 --fuzz=0 44 45-a:: 46 Add authorship information. Adds Author line, and Committer (if 47 different from Author) to the message. 48 49-d:: 50 Set an alternative CVSROOT to use. This corresponds to the CVS 51 -d parameter. Usually users will not want to set this, except 52 if using CVS in an asymmetric fashion. 53 54-f:: 55 Force the merge even if the files are not up to date. 56 57-P:: 58 Force the parent commit, even if it is not a direct parent. 59 60-m:: 61 Prepend the commit message with the provided prefix. 62 Useful for patch series and the like. 63 64-u:: 65 Update affected files from CVS repository before attempting export. 66 67-k:: 68 Reverse CVS keyword expansion (e.g. $Revision: 1.2.3.4$ 69 becomes $Revision$) in working CVS checkout before applying patch. 70 71-w:: 72 Specify the location of the CVS checkout to use for the export. This 73 option does not require GIT_DIR to be set before execution if the 74 current directory is within a git repository. The default is the 75 value of 'cvsexportcommit.cvsdir'. 76 77-W:: 78 Tell cvsexportcommit that the current working directory is not only 79 a Git checkout, but also the CVS checkout. Therefore, Git will 80 reset the working directory to the parent commit before proceeding. 81 82-v:: 83 Verbose. 84 85CONFIGURATION 86------------- 87cvsexportcommit.cvsdir:: 88 The default location of the CVS checkout to use for the export. 89 90EXAMPLES 91-------- 92 93Merge one patch into CVS:: 94+ 95------------ 96$ export GIT_DIR=~/project/.git 97$ cd ~/project_cvs_checkout 98$ git cvsexportcommit -v <commit-sha1> 99$ cvs commit -F .msg <files> 100------------ 101 102Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo:: 103+ 104------------ 105 $ git cvsexportcommit -v -c -w ~/project_cvs_checkout <commit-sha1> 106------------ 107 108Merge pending patches into CVS automatically -- only if you really know what you are doing:: 109+ 110------------ 111$ export GIT_DIR=~/project/.git 112$ cd ~/project_cvs_checkout 113$ git cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git cvsexportcommit -c -p -v 114------------ 115 116GIT 117--- 118Part of the linkgit:git[1] suite