From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 9 Sep 2019 22:57:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'staging/master'
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/e2bf49e8e60e108d638d36c2ab3d952955506d51

Merge remote-tracking branch 'staging/master'

* staging/master:
  dot/gitconfig.in: Support the `scissors' convention in incoming mail.
  dot/gitconfig.in: Force the `from' address on Git patches.
  dot/gitconfig.in: Delete the `patches' alias.
---

e2bf49e8e60e108d638d36c2ab3d952955506d51