diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 04:50:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 04:50:26 (GMT) |
| commit | 59bb0aa93e6edaca44b2a5488fc915d468bae46f (patch) | |
| tree | 767fc86623415632a6cbee709b2484bf0d91d53a /builtin/log.c | |
| parent | 8e97852919fa422bc5fe57bc7e71826cf2b5224d (diff) | |
| parent | 364bc11fe5711fe7fbb98abf376168a207e7a448 (diff) | |
| download | git-59bb0aa93e6edaca44b2a5488fc915d468bae46f.zip git-59bb0aa93e6edaca44b2a5488fc915d468bae46f.tar.gz git-59bb0aa93e6edaca44b2a5488fc915d468bae46f.tar.bz2 | |
Merge branch 'so/log-diff-merge'
"git log" learned "--diff-merges=<style>" option, with an
associated configuration variable log.diffMerges.
* so/log-diff-merge:
doc/diff-options: document new --diff-merges features
diff-merges: introduce log.diffMerges config variable
diff-merges: adapt -m to enable default diff format
diff-merges: refactor set_diff_merges()
diff-merges: introduce --diff-merges=on
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 8acd285..6102893 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; |