diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 09322b1da92fd32204c8b4b07cf12decccfe47f3 (patch) | |
| tree | 74698f04a0722bf2ab75f8af317b9225ba414860 /diff-merges.h | |
| parent | 564a4fc8471b41fc05bda16e4bbb02a99b515cbf (diff) | |
| download | git-09322b1da92fd32204c8b4b07cf12decccfe47f3.zip git-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.gz git-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.bz2 | |
diff-merges: new function diff_merges_suppress()
This function sets all the relevant flags to disabled state, so that
no code that checks only one of them get it wrong.
Then we call this new function everywhere where diff merges output
suppression is needed.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
| -rw-r--r-- | diff-merges.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-merges.h b/diff-merges.h index 243ef91..a031240 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -13,6 +13,8 @@ void diff_merges_init_revs(struct rev_info *revs); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); +void diff_merges_suppress(struct rev_info *revs); + void diff_merges_default_to_first_parent(struct rev_info *revs); void diff_merges_default_to_dense_combined(struct rev_info *revs); |