diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-28 14:08:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-28 14:08:50 -0800 |
| commit | 0433d533f13671f4313c31e34707f0f5281a18e0 (patch) | |
| tree | 0b6e055b35fe853705118d32481d9c7602b3b331 /Documentation | |
| parent | Merge branch 'ws/curl-http-proxy-over-https' (diff) | |
| parent | t5573, t7612: clean up after unexpected success of 'pull' and 'merge' (diff) | |
| download | tgif-0433d533f13671f4313c31e34707f0f5281a18e0.tar.xz | |
Merge branch 'hi/merge-verify-sig-config'
"git merge" learned to pay attention to merge.verifySignatures
configuration variable and pretend as if '--verify-signatures'
option was given from the command line.
* hi/merge-verify-sig-config:
t5573, t7612: clean up after unexpected success of 'pull' and 'merge'
t: add tests for pull --verify-signatures
merge: add config option for verifySignatures
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/merge-config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index df3ea3779b..12b6bbf591 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -26,6 +26,10 @@ merge.ff:: allowed (equivalent to giving the `--ff-only` option from the command line). +merge.verifySignatures:: + If true, this is equivalent to the --verify-signatures command + line option. See linkgit:git-merge[1] for details. + include::fmt-merge-msg-config.txt[] merge.renameLimit:: |