Merge branch 'dl/includeif-onbranch'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:41 +0000 (15:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jul 2019 22:25:41 +0000 (15:25 -0700)
The conditional inclusion mechanism learned to base the choice on
the branch the HEAD currently is on.

* dl/includeif-onbranch:
  config: learn the "onbranch:" includeIf condition


Trivial merge