Documentation / git-cvsexportcommit.txton commit Merge git://git.kernel.org/pub/scm/gitk/gitk (1a17ee2)
   1git-cvsexportcommit(1)
   2======================
   3
   4NAME
   5----
   6git-cvsexportcommit - Export a commit to a CVS checkout
   7
   8
   9SYNOPSIS
  10--------
  11'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [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-cvsapplycommit 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-v::
  43        Verbose.
  44
  45EXAMPLES
  46--------
  47
  48Merge 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
  57Merge 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
  65Author
  66------
  67Written by Martin Langhoff <martin@catalyst.net.nz>
  68
  69Documentation
  70--------------
  71Documentation by Martin Langhoff <martin@catalyst.net.nz>
  72
  73GIT
  74---
  75Part of the gitlink:git[7] suite
  76