Merge branch 'maint'

[git.git] / Documentation / git-cvsexportcommit.txt

diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 555b8234f0ebfe99f5b59f9b5c71ee2569b4e347..4c8d1e638632bc67dcd74536dd6dd287b2604111 100644 (file)
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -8,25 +8,25 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID

 
 
 DESCRIPTION
 -----------
 Exports a commit from GIT to a CVS checkout, making it easier
 
 
 DESCRIPTION
 -----------
 Exports a commit from GIT to a CVS checkout, making it easier

-to merge patches from a git repository into a CVS repository. 
+to merge patches from a git repository into a CVS repository.

 
 

-Execute it from the root of the CVS working copy. GIT_DIR must be defined. 
+Execute it from the root of the CVS working copy. GIT_DIR must be defined.

 See examples below.
 
 See examples below.
 

-It does its best to do the safe thing, it will check that the files are 
-unchanged and up to date in the CVS checkout, and it will not autocommit 
+It does its best to do the safe thing, it will check that the files are
+unchanged and up to date in the CVS checkout, and it will not autocommit

 by default.
 
 Supports file additions, removals, and commits that affect binary files.
 
 by default.
 
 Supports file additions, removals, and commits that affect binary files.
 

-If the commit is a merge commit, you must tell git-cvsapplycommit what parent
-should the changeset be done against. 
+If the commit is a merge commit, you must tell git-cvsexportcommit what parent
+should the changeset be done against.

 
 OPTIONS
 -------
 
 OPTIONS
 -------


@@ -55,9 +55,12 @@ OPTIONS
        Force the parent commit, even if it is not a direct parent.
 
 -m::
        Force the parent commit, even if it is not a direct parent.
 
 -m::

-       Prepend the commit message with the provided prefix. 
+       Prepend the commit message with the provided prefix.

        Useful for patch series and the like.
 
        Useful for patch series and the like.
 

+-u::
+       Update affected files from CVS repository before attempting export.
+

 -v::
        Verbose.
 
 -v::
        Verbose.
 


@@ -70,10 +73,10 @@ Merge one patch into CVS::
 $ export GIT_DIR=~/project/.git
 $ cd ~/project_cvs_checkout
 $ git-cvsexportcommit -v <commit-sha1>
 $ export GIT_DIR=~/project/.git
 $ cd ~/project_cvs_checkout
 $ git-cvsexportcommit -v <commit-sha1>

-$ cvs commit -F .mgs <files> 
+$ cvs commit -F .mgs <files>

 ------------
 
 ------------
 

-Merge pending patches into CVS automatically -- only if you really know what you are doing ::
+Merge pending patches into CVS automatically -- only if you really know what you are doing::

 +
 ------------
 $ export GIT_DIR=~/project/.git
 +
 ------------
 $ export GIT_DIR=~/project/.git


@@ -92,4 +95,3 @@ Documentation by Martin Langhoff <martin@catalyst.net.nz>
 GIT
 ---
 Part of the gitlink:git[7] suite
 GIT
 ---
 Part of the gitlink:git[7] suite

-