]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit3707986b7b9921751aee0e8339914a8c24d81ed0
tree583d4271fe07e80a1a690152ffa3d901243f205f
parent88f95e49afe2684da7e8074d7782eba396604bdb
parent07b2c0eacac91c8db1a371667ed621cff443cf0d
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