Merge branch 'tr/maint-mailinfo'

* tr/maint-mailinfo:
  mailinfo documentation: accurately describe non -k case
This commit is contained in:
Junio C Hamano 2012-01-12 23:34:26 -08:00
commit b51ffa80f6

View File

@ -25,13 +25,24 @@ command directly. See linkgit:git-am[1] instead.
OPTIONS OPTIONS
------- -------
-k:: -k::
Usually the program 'cleans up' the Subject: header line Usually the program removes email cruft from the Subject:
to extract the title line for the commit log message, header line to extract the title line for the commit log
among which (1) remove 'Re:' or 're:', (2) leading message. This option prevents this munging, and is most
whitespaces, (3) '[' up to ']', typically '[PATCH]', and useful when used to read back 'git format-patch -k' output.
then prepends "[PATCH] ". This flag forbids this +
munging, and is most useful when used to read back Specifically, the following are removed until none of them remain:
'git format-patch -k' output. +
--
* Leading and trailing whitespace.
* Leading `Re:`, `re:`, and `:`.
* Leading bracketed strings (between `[` and `]`, usually
`[PATCH]`).
--
+
Finally, runs of whitespace are normalized to a single ASCII space
character.
-b:: -b::
When -k is not in effect, all leading strings bracketed with '[' When -k is not in effect, all leading strings bracketed with '['