From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Sep 2020 19:36:31 +0000 (-0700)
Subject: Merge branch 'al/ref-filter-merged-and-no-merged'
X-Git-Tag: v2.29.0-rc0~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26a3728bedbdf75c670e21d24f6a30e4673f8d19;p=thirdparty%2Fgit.git

Merge branch 'al/ref-filter-merged-and-no-merged'

"git for-each-ref" and friends that list refs used to allow only
one --merged or --no-merged to filter them; they learned to take
combination of both kind of filtering.

* al/ref-filter-merged-and-no-merged:
  Doc: prefer more specific file name
  ref-filter: make internal reachable-filter API more precise
  ref-filter: allow merged and no-merged filters
  Doc: cover multiple contains/no-contains filters
  t3201: test multiple branch filter combinations
---

26a3728bedbdf75c670e21d24f6a30e4673f8d19