diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-22 13:13:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-22 13:13:22 -0700 |
| commit | 244214e9b6fc35466bf050aa4d50771adc87d96f (patch) | |
| tree | ca1396856ee804b44f02fb88f74951d5a6f925a8 /diff.h | |
| parent | 7bbe59425cb08c4f128b1080365a51c5fbc1026b (diff) | |
| parent | b55e6d36ebce69136559add8fffd1a65df231518 (diff) | |
| download | git-244214e9b6fc35466bf050aa4d50771adc87d96f.tar.gz | |
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
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -400,6 +400,8 @@ struct diff_options { #define COLOR_MOVED_WS_ERROR (1<<0) unsigned color_moved_ws_handling; + bool dry_run; + struct repository *repo; struct strmap *additional_path_headers; |