diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-08-31 23:14:22 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 13:42:58 -0700 |
| commit | 572fc9aa5471ce7a9888f03a32d556350f88a5cf (patch) | |
| tree | bb1e8ee0a3b79151a97235355210d664e7d27321 /revision.h | |
| parent | d9cd4331470f4d9d78677f12dc79063dab832f53 (diff) | |
| download | git-572fc9aa5471ce7a9888f03a32d556350f88a5cf.tar.gz | |
revision: add separate field for "-m" of "diff-index -m"
Add separate 'match_missing' field for diff-index to use and set it when we
encounter "-m" option. This field won't then be cleared when another meaning of
"-m" is reverted (e.g., by "--no-diff-merges"), nor it will be affected by
future option(s) that might drive 'ignore_merges' field.
Use this new field from diff-lib:do_oneway_diff() instead of reusing
'ignore_merges' field.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h index c1e5bcf139..f6bf860d19 100644 --- a/revision.h +++ b/revision.h @@ -188,6 +188,7 @@ struct rev_info { unsigned int diff:1, full_diff:1, show_root_diff:1, + match_missing:1, no_commit_id:1, verbose_header:1, combine_merges:1, |