1git-cvsexportcommit(1) 2====================== 3 4NAME 5---- 6git-cvsexportcommit - Export a single commit to a CVS checkout 7 8 9SYNOPSIS 10-------- 11'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID 12 13 14DESCRIPTION 15----------- 16Exports a commit from GIT to a CVS checkout, making it easier 17to merge patches from a git repository into a CVS repository. 18 19Execute it from the root of the CVS working copy. GIT_DIR must be defined. 20See examples below. 21 22It does its best to do the safe thing, it will check that the files are 23unchanged and up to date in the CVS checkout, and it will not autocommit 24by default. 25 26Supports file additions, removals, and commits that affect binary files. 27 28If the commit is a merge commit, you must tell git-cvsexportcommit what parent 29should the changeset be done against. 30 31OPTIONS 32------- 33 34-c:: 35 Commit automatically if the patch applied cleanly. It will not 36 commit if any hunks fail to apply or there were other problems. 37 38-p:: 39 Be pedantic (paranoid) when applying patches. Invokes patch with 40 --fuzz=0 41 42-a:: 43 Add authorship information. Adds Author line, and Committer (if 44 different from Author) to the message. 45 46-d:: 47 Set an alternative CVSROOT to use. This corresponds to the CVS 48 -d parameter. Usually users will not want to set this, except 49 if using CVS in an asymmetric fashion. 50 51-f:: 52 Force the merge even if the files are not up to date. 53 54-P:: 55 Force the parent commit, even if it is not a direct parent. 56 57-m:: 58 Prepend the commit message with the provided prefix. 59 Useful for patch series and the like. 60 61-u:: 62 Update affected files from CVS repository before attempting export. 63 64-v:: 65 Verbose. 66 67EXAMPLES 68-------- 69 70Merge one patch into CVS:: 71+ 72------------ 73$ export GIT_DIR=~/project/.git 74$ cd ~/project_cvs_checkout 75$ git-cvsexportcommit -v <commit-sha1> 76$ cvs commit -F .mgs <files> 77------------ 78 79Merge pending patches into CVS automatically -- only if you really know what you are doing:: 80+ 81------------ 82$ export GIT_DIR=~/project/.git 83$ cd ~/project_cvs_checkout 84$ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v 85------------ 86 87Author 88------ 89Written by Martin Langhoff <martin@catalyst.net.nz> 90 91Documentation 92-------------- 93Documentation by Martin Langhoff <martin@catalyst.net.nz> 94 95GIT 96--- 97Part of the gitlink:git[7] suite