Merge branch 'sb/diff-blobfind-pickaxe'
commitc0d75f0e2e2cbf432358bfd00be593fd28e257a3
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:37 +0000 (23 13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:37 +0000 (23 13:16 -0800)
treeddf40ec50af3fb5dae3793950ec366fd3a03e2b5
parentaddd37cd64e109eb0224e522869962519224cc78
parent4d8c51aa19be94bddb7cac6b11bccb4d23dfd4f8
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
Documentation/diff-options.txt
builtin/log.c
diff.c
diff.h
revision.c