tree ca1396856ee804b44f02fb88f74951d5a6f925a8
parent 7bbe59425cb08c4f128b1080365a51c5fbc1026b
parent b55e6d36ebce69136559add8fffd1a65df231518
author Junio C Hamano <gitster@pobox.com> 1755893602 -0700
committer Junio C Hamano <gitster@pobox.com> 1755893602 -0700

Merge branch 'ly/diff-name-only-with-diff-from-content'

Various options to "git diff" that makes comparison ignore certain
aspects of the differences (like "space changes are ignored",
"differences in lines that match these regular expressions are
ignored") did not work well with "--name-only" and friends.

* ly/diff-name-only-with-diff-from-content:
  diff: ensure consistent diff behavior with ignore options