Merge branch 'dh/pack'

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

diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 27d531b888ef0468022e2ec0780729acc5151147..fd7f54093fc3d0a85126a0826affb712096aa144 100644 (file)
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

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

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -25,7 +25,7 @@ by default.
 
 Supports file additions, removals, and commits that affect binary files.
 
 
 Supports file additions, removals, and commits that affect binary files.
 

-If the commit is a merge commit, you must tell git-cvsapplycommit what parent
+If the commit is a merge commit, you must tell git-cvsexportcommit what parent

 should the changeset be done against. 
 
 OPTIONS
 should the changeset be done against. 
 
 OPTIONS


@@ -43,6 +43,11 @@ OPTIONS
        Add authorship information. Adds Author line, and Committer (if
        different from Author) to the message.
 
        Add authorship information. Adds Author line, and Committer (if
        different from Author) to the message.
 

+-d::
+       Set an alternative CVSROOT to use.  This corresponds to the CVS
+       -d parameter.  Usually users will not want to set this, except
+       if using CVS in an asymmetric fashion.
+

 -f::
        Force the merge even if the files are not up to date.
 
 -f::
        Force the merge even if the files are not up to date.