diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2021-04-13 14:41:17 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-16 23:38:35 -0700 |
| commit | 17c13e60fd799336b28d320dcba06fe1ef06e01d (patch) | |
| tree | 06050127b529d7308656ae8a218c3e7c9db5d431 /builtin/log.c | |
| parent | diff-merges: adapt -m to enable default diff format (diff) | |
| download | tgif-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.xz | |
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 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c index f67b67d80e..e52127a9a5 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -481,6 +481,8 @@ static int git_log_config(const char *var, const char *value, void *cb) decoration_style = 0; /* maybe warn? */ return 0; } + if (!strcmp(var, "log.diffmerges")) + return diff_merges_config(value); if (!strcmp(var, "log.showroot")) { default_show_root = git_config_bool(var, value); return 0; |