From: Bruno Vieira Date: Wed, 22 Apr 2015 00:13:54 GMT Subject: [PATCH] builtin/merge.c: add the merge.verifysignatures config option Message-ID: <1429661634-45033-1-git-send-email-mail@bmpvieira.com> Signed-off-by: Bruno Vieira --- This seemed to be missing. Sorry if otherwise or if I'm doing something wrong (first time contributing). builtin/merge.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/merge.c b/builtin/merge.c index 3b0f8f9..5dbc10f 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -598,6 +598,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, "merge.verifysignatures")) { + verify_signatures = git_config_bool(k, v); + return 0; } else if (!strcmp(k, "commit.gpgsign")) { sign_commit = git_config_bool(k, v) ? "" : NULL; return 0; -- 2.3.2 (Apple Git-55)