diff options
| author | Simon 'corecode' Schubert <corecode@fs.ei.tum.de> | 2007-02-01 11:43:39 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-05 14:10:01 -0800 |
| commit | ca28370a3567c14841c594b89fd62449abc166e6 (patch) | |
| tree | 0b6af18340d906d71f8c85a0ac7abc2ef769417d /Documentation/git-cvsexportcommit.txt | |
| parent | 4c55068683ac2e9765ba6e112d2227e50fefae87 (diff) | |
| download | git-ca28370a3567c14841c594b89fd62449abc166e6.tar.gz | |
Allow forcing of a parent commit, even if the parent is not a direct one.
This can be used to compress multiple changesets into one, for example
like
git cvsexportcommit -P cvshead mybranch
without having to do so in git first.
Signed-off-by: Simon 'corecode' Schubert <corecode@fs.ei.tum.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cvsexportcommit.txt')
| -rw-r--r-- | Documentation/git-cvsexportcommit.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index 347cbcec35..27d531b888 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] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -46,6 +46,9 @@ OPTIONS -f:: Force the merge even if the files are not up to date. +-P:: + Force the parent commit, even if it is not a direct parent. + -m:: Prepend the commit message with the provided prefix. Useful for patch series and the like. |