summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Lichtenheld <frank@lichtenheld.de>2007-05-14 16:44:52 +0200
committerJunio C Hamano <junkio@cox.net>2007-05-14 17:23:52 -0700
commit7b1885d1e74029fe978be739d2d8d911a34ed8bf (patch)
treeb0135cc7274472d9cfc877e225d495e393bc9d3b
parent2dc189a3536a367444a4176684c89b994e93e736 (diff)
downloadgit-7b1885d1e74029fe978be739d2d8d911a34ed8bf.tar.gz
Documentation: format-patch has no --mbox option
git-applymbox and git-mailinfo refer to a --mbox option of git-format-patch when talking about their -k options. But there is no such option. What -k does to the former two commands is to keep the Subject: lines unmunged, meant to be used on output generated with format-patch -k. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-applymbox.txt2
-rw-r--r--Documentation/git-mailinfo.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt
index 3bc92d8cf1..ea919ba5d7 100644
--- a/Documentation/git-applymbox.txt
+++ b/Documentation/git-applymbox.txt
@@ -31,7 +31,7 @@ OPTIONS
whitespaces, (3) '[' up to ']', typically '[PATCH]', and
then prepends "[PATCH] ". This flag forbids this
munging, and is most useful when used to read back 'git
- format-patch --mbox' output.
+ format-patch -k' output.
-m::
Patches are applied with `git-apply` command, and unless
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index ba18133ead..8eadcebfcf 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -30,7 +30,7 @@ OPTIONS
whitespaces, (3) '[' up to ']', typically '[PATCH]', and
then prepends "[PATCH] ". This flag forbids this
munging, and is most useful when used to read back 'git
- format-patch --mbox' output.
+ format-patch -k' output.
-u::
The commit log message, author name and author email are