| Martin Langhoff | 5e0306a | 2005-11-07 17:57:08 +1300 | [diff] [blame] | 1 | git-cvsexportcommit(1) |
| Junio C Hamano | 79f6ac7 | 2005-11-07 17:53:06 -0800 | [diff] [blame] | 2 | ====================== |
| Martin Langhoff | 5e0306a | 2005-11-07 17:57:08 +1300 | [diff] [blame] | 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git-cvsexportcommit - Export a commit to a CVS checkout |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| Jonas Fonseca | 353ce81 | 2005-12-31 18:37:15 +0100 | [diff] [blame] | 11 | 'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID |
| Martin Langhoff | 5e0306a | 2005-11-07 17:57:08 +1300 | [diff] [blame] | 12 | |
| 13 | |
| 14 | DESCRIPTION |
| 15 | ----------- |
| 16 | Exports a commit from GIT to a CVS checkout, making it easier |
| 17 | to merge patches from a git repository into a CVS repository. |
| 18 | |
| 19 | Execute it from the root of the CVS working copy. GIT_DIR must be defined. |
| Martin Langhoff | 1506fc3 | 2006-01-30 19:34:15 +1300 | [diff] [blame] | 20 | See examples below. |
| Martin Langhoff | 5e0306a | 2005-11-07 17:57:08 +1300 | [diff] [blame] | 21 | |
| 22 | It does its best to do the safe thing, it will check that the files are |
| 23 | unchanged and up to date in the CVS checkout, and it will not autocommit |
| 24 | by default. |
| 25 | |
| 26 | Supports file additions, removals, and commits that affect binary files. |
| 27 | |
| 28 | If the commit is a merge commit, you must tell git-cvsapplycommit what parent |
| 29 | should the changeset be done against. |
| 30 | |
| 31 | OPTIONS |
| 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 | -v:: |
| 43 | Verbose. |
| 44 | |
| Martin Langhoff | 1506fc3 | 2006-01-30 19:34:15 +1300 | [diff] [blame] | 45 | EXAMPLES |
| 46 | -------- |
| 47 | |
| 48 | Merge one patch into CVS:: |
| 49 | + |
| 50 | ------------ |
| 51 | $ export GIT_DIR=~/project/.git |
| 52 | $ cd ~/project_cvs_checkout |
| 53 | $ git-cvsexportcommit -v <commit-sha1> |
| 54 | $ cvs commit -F .mgs <files> |
| 55 | ------------ |
| 56 | |
| 57 | Merge pending patches into CVS automatically -- only if you really know what you are doing :: |
| 58 | + |
| 59 | ------------ |
| 60 | $ export GIT_DIR=~/project/.git |
| 61 | $ cd ~/project_cvs_checkout |
| 62 | $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit -c -p -v |
| 63 | ------------ |
| 64 | |
| Martin Langhoff | 5e0306a | 2005-11-07 17:57:08 +1300 | [diff] [blame] | 65 | Author |
| 66 | ------ |
| 67 | Written by Martin Langhoff <martin@catalyst.net.nz> |
| 68 | |
| 69 | Documentation |
| 70 | -------------- |
| 71 | Documentation by Martin Langhoff <martin@catalyst.net.nz> |
| 72 | |
| 73 | GIT |
| 74 | --- |
| 75 | Part of the gitlink:git[7] suite |
| 76 | |
