From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Feb 2023 18:08:57 +0000 (-0800)
Subject: Merge branch 'jc/countermand-format-attach'
X-Git-Tag: v2.40.0-rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=630501ceef6a70203f89ab62c9909c96a2d751ec;p=thirdparty%2Fgit.git

Merge branch 'jc/countermand-format-attach'

The format.attach configuration variable lacked a way to override a
value defined in a lower-priority configuration file (e.g. the
system one) by redefining it in a higher-priority configuration
file.  Now, setting format.attach to an empty string means show the
patch inline in the e-mail message, without using MIME attachment.

This is a backward incompatible change.

* jc/countermand-format-attach:
  format.attach: allow empty value to disable multi-part messages
---

630501ceef6a70203f89ab62c9909c96a2d751ec