From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Jan 2018 21:16:37 +0000 (-0800)
Subject: Merge branch 'sb/diff-blobfind-pickaxe'
X-Git-Tag: v2.17.0-rc0~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0d75f0e2e2cbf432358bfd00be593fd28e257a3;p=git

Merge branch 'sb/diff-blobfind-pickaxe'

"diff" family of commands learned "--find-object=<object-id>" option
to limit the findings to changes that involve the named object.

* sb/diff-blobfind-pickaxe:
  diff: use HAS_MULTI_BITS instead of counting bits manually
  diff: properly error out when combining multiple pickaxe options
  diffcore: add a pickaxe option to find a specific blob
  diff: introduce DIFF_PICKAXE_KINDS_MASK
  diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
  diff.h: make pickaxe_opts an unsigned bit field
---

c0d75f0e2e2cbf432358bfd00be593fd28e257a3