Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> --- Documentation/config.txt | 7 +------ Documentation/config/mailinfo.txt | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Documentation/config/mailinfo.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index cce89ea50c..585d55d03d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -365,12 +365,7 @@ include::config/interactive.txt[] include::config/log.txt[] -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 "-"). +include::config/mailinfo.txt[] mailmap.file:: The location of an augmenting mailmap file. The default diff --git a/Documentation/config/mailinfo.txt b/Documentation/config/mailinfo.txt new file mode 100644 index 0000000000..3854d4ae37 --- /dev/null +++ b/Documentation/config/mailinfo.txt @@ -0,0 +1,6 @@ +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 "-"). -- 2.19.1.647.g708186aaf9
