Documentation/git-cvsexportcommit.txt

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