tree 2cb960e05c264e7011e0dddf33694fedb857031f
parent 4d515253afcef985e94400adbfed7044959f9121
parent b59cdffd7e3d791ee289ebb46d7109ad3d51d7ea
author Junio C Hamano <gitster@pobox.com> 1600803391 -0700
committer Junio C Hamano <gitster@pobox.com> 1600803391 -0700

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