summaryrefslogtreecommitdiff
path: root/builtin-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-10 00:50:59 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-10 01:05:47 -0700
commit4393c2374101fef9053643f9b4ec638b05bd0b26 (patch)
tree6148268877dac7ac97bf39628ef92c97680d3c33 /builtin-merge.c
parent1c7b76be7d620bbaf2e6b8417f04012326bbb9df (diff)
downloadgit-4393c2374101fef9053643f9b4ec638b05bd0b26.tar.gz
Teach merge.log to "git-merge" again
The command forgot the configuration variable when rewritten in C. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge.c')
-rw-r--r--builtin-merge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c
index b2e702a11f..2ee1674690 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -464,6 +464,8 @@ int git_merge_config(const char *k, const char *v, void *cb)
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);
}