diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 15:27:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 15:27:24 -0700 |
| commit | 198b1f1fbb7b9bb186d3e7bc86f62813bccc396a (patch) | |
| tree | 78a3fb45dce6ca0bf5c13f3446ecc7b91e753036 /merge-options.txt | |
| parent | eda40534055629f4ae708ab5ab19c317d2161e42 (diff) | |
| download | git-htmldocs-198b1f1fbb7b9bb186d3e7bc86f62813bccc396a.tar.gz | |
Autogenerated HTML docs for v2.8.2-534-g1f669
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/merge-options.txt b/merge-options.txt index dfb43d000..5b4a62e93 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -89,8 +89,11 @@ option can be used to override --squash. --verify-signatures:: --no-verify-signatures:: - Verify that the commits being merged have good and trusted GPG signatures - and abort the merge in case they do not. + Verify that the tip commit of the side branch being merged is + signed with a valid key, i.e. a key that has a valid uid: in the + default trust model, this means the signing key has been signed by + a trusted key. If the tip commit of the side branch is not signed + with a valid key, the merge is aborted. --summary:: --no-summary:: |