Merge branch 'bp/commit-p-editor'

diff --git a/builtin/merge.c b/builtin/merge.c
index b11a528ce5580d5e5b9b61f291e0d829a735ae6a..e15d0e145a51d52687619673aec3ee80c0485375 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);