diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:37 -0800 |
| commit | c0d75f0e2e2cbf432358bfd00be593fd28e257a3 (patch) | |
| tree | ddf40ec50af3fb5dae3793950ec366fd3a03e2b5 /ci | |
| parent | Merge branch 'jk/abort-clone-with-existing-dest' (diff) | |
| parent | diff: use HAS_MULTI_BITS instead of counting bits manually (diff) | |
| download | tgif-c0d75f0e2e2cbf432358bfd00be593fd28e257a3.tar.xz | |
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
Diffstat (limited to 'ci')
0 files changed, 0 insertions, 0 deletions