Merge remote-tracking branch 'staging/master'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 9 Sep 2019 22:57:27 +0000 (23:57 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 9 Sep 2019 22:57:27 +0000 (23:57 +0100)
* 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.


Trivial merge