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 /Documentation/merge-config.txt | |
| 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 'Documentation/merge-config.txt')
| -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:: |