[PATCH] builtin/merge.c: add the merge.verifysignatures config option
From: Bruno Vieira <hidden>
Date: 2016-06-15 23:04:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Bruno Vieira <redacted> --- 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)