summaryrefslogtreecommitdiff
path: root/Documentation/git-cvsexportcommit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 13:37:20 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 13:37:20 -0700
commit6c99f18660f62f90b83f0592c81ab6a4092d6d13 (patch)
tree24cd8428bdf1bfcd89ee61a66acd8bc91b8b03c4 /Documentation/git-cvsexportcommit.txt
parent7e83003029ed488253f6173b047a9c77933c8561 (diff)
parentd775734c40afed216160437c59a45c93bdf28689 (diff)
downloadgit-6c99f18660f62f90b83f0592c81ab6a4092d6d13.tar.gz
Merge branch 'js/cvsexportcommit'
* js/cvsexportcommit: cvsexportcommit: introduce -W for shared working trees (between Git and CVS) cvsexportcommit: chomp only removes trailing whitespace Conflicts: git-cvsexportcommit.perl
Diffstat (limited to 'Documentation/git-cvsexportcommit.txt')
-rw-r--r--Documentation/git-cvsexportcommit.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 363c36d694..f75afaaadc 100644
--- 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
--------
-'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot] [-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
DESCRIPTION
@@ -68,6 +68,11 @@ OPTIONS
current directory is within a git repository. The default is the
value of 'cvsexportcommit.cvsdir'.
+-W::
+ Tell cvsexportcommit that the current working directory is not only
+ a Git checkout, but also the CVS checkout. Therefore, Git will
+ reset the working directory to the parent commit before proceeding.
+
-v::
Verbose.