commit-tree: add and document --no-gpg-sign

diff --git a/builtin/merge.c b/builtin/merge.c
index 02a69c14e6abfc51413b397a93180e0890285e2a..fea27244557d5f0f7ab556a251cf0108a81f397a 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -604,6 +604,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);