diff options
| author | Hans Jerry Illikainen <hji@dyntopia.com> | 2017-12-10 07:53:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-12 19:51:38 +0100 |
| commit | ca779e82c9f263dfdea2a73a4f5494b37bc8aae7 (patch) | |
| tree | 7ec371c22e16762da499e79911037ba510acdde8 /builtin | |
| parent | RelNotes: the eighth batch (diff) | |
| download | git-ca779e82c9f263dfdea2a73a4f5494b37bc8aae7.tar.xz git-ca779e82c9f263dfdea2a73a4f5494b37bc8aae7.zip | |
merge: add config option for verifySignatures
git merge --verify-signatures can be used to verify that the tip commit
of the branch being merged in is properly signed, but it's cumbersome to
have to specify that every time.
Add a configuration option that enables this behaviour by default, which
can be overridden by --no-verify-signatures.
Signed-off-by: Hans Jerry Illikainen <hji@dyntopia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 612dd7bfb6..30264cfd7c 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -567,6 +567,8 @@ static int git_merge_config(const char *k, const char *v, void *cb) if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat")) show_diffstat = git_config_bool(k, v); + else if (!strcmp(k, "merge.verifysignatures")) + verify_signatures = git_config_bool(k, v); else if (!strcmp(k, "pull.twohead")) return git_config_string(&pull_twohead, k, v); else if (!strcmp(k, "pull.octopus")) |