Merge branch 'jt/trailer-with-cruft'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2016 19:23:17 +0000 (11:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2016 19:23:17 +0000 (11:23 -0800)
Doc update.

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

Trivial merge