diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-17 11:40:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-17 11:40:15 -0700 |
| commit | 1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e (patch) | |
| tree | f72301557649cd895d16b15bce21ef6b47fb36ca /diff.h | |
| parent | c44beea485f0f2feaf460e2ac87fdd5608d63cf0 (diff) | |
| parent | b55e6d36ebce69136559add8fffd1a65df231518 (diff) | |
| download | git-1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e.tar.gz | |
Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-from-contents-fix
* 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; |