summaryrefslogtreecommitdiffstats
path: root/git-cvsexportcommit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-07-24 08:25:03 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-07-24 08:25:03 +0000
commit75cc4c91e042ed3ab841e5e50cac5a974bfd5f4e (patch)
tree4ba07640004473d81abf1fa3a3287f35742ec52c /git-cvsexportcommit.txt
parent7ccb9fd251897744e84ea1692321ec66a3b0164a (diff)
downloadgit-htmldocs-75cc4c91e042ed3ab841e5e50cac5a974bfd5f4e.tar.gz
Autogenerated HTML docs for v1.4.2-rc1-g0d51
Diffstat (limited to 'git-cvsexportcommit.txt')
-rw-r--r--git-cvsexportcommit.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index 27ac72d98..092d0d673 100644
--- a/git-cvsexportcommit.txt
+++ b/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.