Re: [PATCH v2 1/2] Documentation/config.txt: document mailinfo.scissor
On Fri, Feb 20, 2015 at 5:29 AM, Matthieu Moy <Matthieu.Moy@imag.fr> wrote:
Show 11 quoted lines
> Subject: Documentation/config.txt: document mailinfo.scissor
>
> The variable was documented in git-mailinfo.txt, but not in config.txt.
> The detailed documentation is still the one of --scissors in
> git-mailinfo.txt, but we give enough information here to let the user
> understand what it is about, and to make it easy to find it (e.g.
> searching ">8" and "8<" finds it).
>
> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
> Changes since v1 for both patches : typos noted by Peff.
The same typo (s/scissor/scissors/) exists in the subjects.
Show 23 quoted lines
> Documentation/config.txt | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index ae6791d..15f8695 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1740,6 +1740,13 @@ log.mailmap::
> If true, makes linkgit:git-log[1], linkgit:git-show[1], and
> linkgit:git-whatchanged[1] assume `--use-mailmap`.
>
> +mailinfo.scissors::
> + If true, makes linkgit:git-mailinfo[1] (and therefore
> + linkgit:git-am[1]) act by default as if the --scissors option
> + was provided on the command-line. When active, this features
> + removes everything from the message body before a scissors
> + line (i.e. consisting mainly of ">8", "8<" and "-").
> +
> mailmap.file::
> The location of an augmenting mailmap file. The default
> mailmap, located in the root of the repository, is loaded
> --
> 2.3.0.157.g79e124b
Eric Sunshine <sunshine@sunshineco.com>