aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Lukas Sandström <lukass@etek.chalmers.se> 2008-07-10 23:36:28 +0200
committerGravatar Junio C Hamano <gitster@pobox.com> 2008-07-11 21:10:13 -0700
commitb4958181a9afd0a7a2622d18416f88f9222123f0 (patch)
treefc9d552b755d4489b937e3240e330932ebc0788e
parent8c6202d8696d2e3ae016042acd05f6a82763a5e3 (diff)
downloadgit-b4958181a9afd0a7a2622d18416f88f9222123f0.tar.gz
git-b4958181a9afd0a7a2622d18416f88f9222123f0.zip
git-mailinfo: document the -n option
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-mailinfo.txt5
-rw-r--r--builtin-mailinfo.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 183dc1dd75..1e126f4a5c 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -8,7 +8,7 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message
SYNOPSIS
--------
-'git-mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
+'git-mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>
DESCRIPTION
@@ -46,6 +46,9 @@ conversion, even with this flag.
from what is specified by i18n.commitencoding, this flag
can be used to override it.
+-n::
+ Disable all charset re-coding of the metadata.
+
<msg>::
The commit log message extracted from e-mail, usually
except the title line which comes from e-mail Subject.
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index fa6e8f90a4..962aa34c8e 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -960,7 +960,7 @@ static int mailinfo(FILE *in, FILE *out, int ks, const char *encoding,
}
static const char mailinfo_usage[] =
- "git-mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info";
+ "git-mailinfo [-k] [-u | --encoding=<encoding> | -n] msg patch <mail >info";
int cmd_mailinfo(int argc, const char **argv, const char *prefix)
{