Merge branch 'ah/doc-gitk-config'

diff --git a/builtin/merge.c b/builtin/merge.c
index e576a7fdc619303a65e859920a1ab6936db2626c..f0cf1205faa66c5ae8b4603f04239f1efbd999d6 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -597,6 +597,9 @@ static int git_merge_config(const char *k, const char *v, void *cb)
        } else if (!strcmp(k, "merge.defaulttoupstream")) {
                default_to_upstream = git_config_bool(k, v);
                return 0;
+       } else if (!strcmp(k, "commit.gpgsign")) {
+               sign_commit = git_config_bool(k, v) ? "" : NULL;
+               return 0;
        }
 
        status = fmt_merge_msg_config(k, v, cb);