From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:41 +0000 (-0700)
Subject: Merge branch 'dl/includeif-onbranch'
X-Git-Tag: v2.23.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3707986b7b9921751aee0e8339914a8c24d81ed0;p=thirdparty%2Fgit.git

Merge branch 'dl/includeif-onbranch'

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
---

3707986b7b9921751aee0e8339914a8c24d81ed0