diff options
| author | Sergey Organov <sorganov@gmail.com> | 2021-04-13 13:41:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-17 08:38:35 +0200 |
| commit | 17c13e60fd799336b28d320dcba06fe1ef06e01d (patch) | |
| tree | 06050127b529d7308656ae8a218c3e7c9db5d431 /diff-merges.h | |
| parent | diff-merges: adapt -m to enable default diff format (diff) | |
| download | git-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.xz git-17c13e60fd799336b28d320dcba06fe1ef06e01d.zip | |
diff-merges: introduce log.diffMerges config variable
New log.diffMerges configuration variable sets the format that
--diff-merges=on will be using. The default is "separate".
t4013: add the following tests for log.diffMerges config:
* Test that wrong values are denied.
* Test that the value of log.diffMerges properly affects both
--diff-merges=on and -m.
t9902: fix completion tests for log.d* to match log.diffMerges.
Added documentation for log.diffMerges.
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 659467c99a..09d9a6c9a4 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -9,6 +9,8 @@ struct rev_info; +int diff_merges_config(const char *value); + int diff_merges_parse_opts(struct rev_info *revs, const char **argv); void diff_merges_suppress(struct rev_info *revs); |