diff options
| author | Nicolas Vigier <boklm@mars-attacks.org> | 2013-11-05 00:14:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-24 14:50:56 -0800 |
| commit | d95bfb12b87a0be9666f806683e198df9738d0e7 (patch) | |
| tree | 37908b19d235a3c94dbf375ea457d9e0249c5319 /builtin/merge.c | |
| parent | f26f72de159d7ade2fbe8b48734ce98c1aba4d72 (diff) | |
| download | git-d95bfb12b87a0be9666f806683e198df9738d0e7.tar.gz git-d95bfb12b87a0be9666f806683e198df9738d0e7.tar.xz | |
commit-tree: add the commit.gpgsign option to sign all commits
If you want to GPG sign all your commits, you have to add the -S option
all the time. The commit.gpgsign config option allows to sign all
commits automatically.
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 02a69c14e..fea272445 100644 --- 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); |