Merge branch 'jt/trailer-with-cruft'

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

Junio C Hamano committed Nov 23, 2016 at 11:23 UTC 6a2b569c2fec49cc213e0218f1251749771044d6

No changes.