diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-14 00:42:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-14 00:42:16 -0700 |
| commit | 5f7f211a54cb62fba4f017cdf3b9bc0c3a7843e1 (patch) | |
| tree | 701dae949392825a1045970c3120e80e8eecfd12 /Documentation | |
| parent | 3a3e89b897e122f1f154293e55b1d6c863ffbd2c (diff) | |
| parent | 5c222ce2c415ccf7ce1e9281eb49f0a6f26657fa (diff) | |
| download | git-5f7f211a54cb62fba4f017cdf3b9bc0c3a7843e1.tar.gz | |
Merge branch 'ml/cvs'
* ml/cvs:
Change to allow subdir updates from Eclipse
Many fixes for most operations in Eclipse.
Added logged warnings for CVS error returns
cvsserver: use git-rev-list instead of git-log
git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cvsexportcommit.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index d30435a9e4..56bd3e517d 100644 --- a/Documentation/git-cvsexportcommit.txt +++ b/Documentation/git-cvsexportcommit.txt @@ -8,7 +8,7 @@ git-cvsexportcommit - Export a commit to a CVS checkout SYNOPSIS -------- -'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [PARENTCOMMIT] COMMITID +'git-cvsexportcommmit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -39,6 +39,13 @@ OPTIONS Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0 +-f:: + Force the merge even if the files are not up to date. + +-m:: + Prepend the commit message with the provided prefix. + Useful for patch series and the like. + -v:: Verbose. |