Merge remote-tracking branch 'staging'
authorMark Wooding <mdw@distorted.org.uk>
Sun, 20 May 2018 19:22:16 +0000 (20:22 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 20 May 2018 19:22:16 +0000 (20:22 +0100)
commitcaf1fc6497bf52e22e4a43d0b172d73e8c5a205d
treeb8434385b098647445bdc6185d008d68fb57040d
parent2ae8f8e32611d1f581ce8792585f471bb4752c22
parent6690f2cc3b29bab6a01f4e9a77306b659418b05e
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.