The command forgot the configuration variable when rewritten in C. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- builtin-merge.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index 821edcd..bc3f921 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -519,8 +519,10 @@ int git_merge_config(const char *k, const char *v, void *cb) else if (!strcmp(k, "pull.twohead")) return git_config_string(&pull_twohead, k, v); else if (!strcmp(k, "pull.octopus")) return git_config_string(&pull_octopus, k, v); + else if (!strcmp(k, "merge.log") || !strcmp(k, "merge.summary")) + option_log = git_config_bool(k, v); return git_diff_ui_config(k, v, cb); } static int read_tree_trivial(unsigned char *common, unsigned char *head, -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
