7791a1d9b9
The SYNOPSIS sections of most commands that span several lines already use [verse] to retain line breaks. Most commands that don't span several lines seem not to use [verse]. In the HTML output, [verse] does not only preserve line breaks, but also makes the section indented, which causes a slight inconsistency between commands that use [verse] and those that don't. Use [verse] in all SYNOPSIS sections for consistency. Also remove the blank lines from git-fetch.txt and git-rebase.txt to align with the other man pages. In the case of git-rebase.txt, which already uses [verse], the blank line makes the [verse] not apply to the last line, so removing the blank line also makes the formatting within the document more consistent. While at it, add single quotes to 'git cvsimport' for consistency with other commands. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
87 lines
2.8 KiB
Plaintext
87 lines
2.8 KiB
Plaintext
git-mailinfo(1)
|
|
===============
|
|
|
|
NAME
|
|
----
|
|
git-mailinfo - Extracts patch and authorship from a single e-mail message
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch>
|
|
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
Reads a single e-mail message from the standard input, and
|
|
writes the commit log message in <msg> file, and the patches in
|
|
<patch> file. The author name, e-mail and e-mail subject are
|
|
written out to the standard output to be used by 'git am'
|
|
to create a commit. It is usually not necessary to use this
|
|
command directly. See linkgit:git-am[1] instead.
|
|
|
|
|
|
OPTIONS
|
|
-------
|
|
-k::
|
|
Usually the program 'cleans up' the Subject: header line
|
|
to extract the title line for the commit log message,
|
|
among which (1) remove 'Re:' or 're:', (2) leading
|
|
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 -k' output.
|
|
|
|
-b::
|
|
When -k is not in effect, all leading strings bracketed with '['
|
|
and ']' pairs are stripped. This option limits the stripping to
|
|
only the pairs whose bracketed string contains the word "PATCH".
|
|
|
|
-u::
|
|
The commit log message, author name and author email are
|
|
taken from the e-mail, and after minimally decoding MIME
|
|
transfer encoding, re-coded in the charset specified by
|
|
i18n.commitencoding (defaulting to UTF-8) by transliterating
|
|
them. This used to be optional but now it is the default.
|
|
+
|
|
Note that the patch is always used as-is without charset
|
|
conversion, even with this flag.
|
|
|
|
--encoding=<encoding>::
|
|
Similar to -u. But when re-coding, the charset specified here is
|
|
used instead of the one specified by i18n.commitencoding or UTF-8.
|
|
|
|
-n::
|
|
Disable all charset re-coding of the metadata.
|
|
|
|
--scissors::
|
|
Remove everything in body before a scissors line. A line that
|
|
mainly consists of scissors (either ">8" or "8<") and perforation
|
|
(dash "-") marks is called a scissors line, and is used to request
|
|
the reader to cut the message at that line. If such a line
|
|
appears in the body of the message before the patch, everything
|
|
before it (including the scissors line itself) is ignored when
|
|
this option is used.
|
|
+
|
|
This is useful if you want to begin your message in a discussion thread
|
|
with comments and suggestions on the message you are responding to, and to
|
|
conclude it with a patch submission, separating the discussion and the
|
|
beginning of the proposed commit log message with a scissors line.
|
|
+
|
|
This can enabled by default with the configuration option mailinfo.scissors.
|
|
|
|
--no-scissors::
|
|
Ignore scissors lines. Useful for overriding mailinfo.scissors settings.
|
|
|
|
<msg>::
|
|
The commit log message extracted from e-mail, usually
|
|
except the title line which comes from e-mail Subject.
|
|
|
|
<patch>::
|
|
The patch extracted from e-mail.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|