diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2006-07-18 02:22:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-24 05:51:14 (GMT) |
| commit | 1b91abe35079f3d6e6440b9a49766de06f3f1659 (patch) | |
| tree | d9ca580c9952150417938ebd966546d2b264b7f0 /Documentation/git-cvsexportcommit.txt | |
| parent | e7a0f6714bdfa7e3a169cc756a05cbbf787997eb (diff) | |
| download | git-1b91abe35079f3d6e6440b9a49766de06f3f1659.zip git-1b91abe35079f3d6e6440b9a49766de06f3f1659.tar.gz git-1b91abe35079f3d6e6440b9a49766de06f3f1659.tar.bz2 | |
cvsexportcommit - add -a (add author line) flag, cleanup warnings
This patch adds support for -a which will add an "Author: " line, and possibly
a "Committer: " line to the bottom of the commit message for CVS.
The commit message parser is now a little bit better, and some warnings
have been cleaned up.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-cvsexportcommit.txt')
| -rw-r--r-- | Documentation/git-cvsexportcommit.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index 27ac72d..092d0d6 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-cvsexportcommit' [-h] [-v] [-c] [-p] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID +'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID DESCRIPTION @@ -36,9 +36,13 @@ OPTIONS commit if any hunks fail to apply or there were other problems. -p:: - Be pedantic (paranoid) when applying patches. Invokes patch with + Be pedantic (paranoid) when applying patches. Invokes patch with --fuzz=0 +-a:: + Add authorship information. Adds Author line, and Committer (if + different from Author) to the message. + -f:: Force the merge even if the files are not up to date. |