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

Doc update.

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