From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Nov 2016 19:23:17 +0000 (-0800)
Subject: Merge branch 'jt/trailer-with-cruft'
X-Git-Tag: v2.11.0-rc3~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6a2b569c2fec49cc213e0218f1251749771044d6?ds=inline;hp=--cc

Merge branch 'jt/trailer-with-cruft'

Doc update.

* jt/trailer-with-cruft:
doc: mention user-configured trailers
---

6a2b569c2fec49cc213e0218f1251749771044d6