From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 20 May 2018 19:22:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'staging'
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/caf1fc6497bf52e22e4a43d0b172d73e8c5a205d

Merge remote-tracking branch 'staging'

* staging:
  dot/gitconfig.in: Don't have `git send-email' try to do threading.
  dot/gitconfig.in: Abolish the `git email' alias.
  dot/gitconfig.in: Remove output filename; force full indices.
  git/gitignore: Ignore toplevel `p/' and `p.*/' directories.
  git/gitignore: Only ignore `build' etc. if they're toplevel directories.
  git/gitignore: Deprecate `deb-build/' and `build-*/' directories.
  dot/gitconfig.in: Configure `format-patch' to do sensible things.
---

caf1fc6497bf52e22e4a43d0b172d73e8c5a205d