diff options
| author | Sebastian Götte <jaseg@physik.tu-berlin.de> | 2013-03-31 16:02:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 05:38:49 (GMT) |
| commit | eb307ae7bb78ccde4e2ac69f302ccf8834883628 (patch) | |
| tree | 40bed8e400a5208b7c81ff94752133818014da6b /Documentation/merge-options.txt | |
| parent | efed0022492b81bf59d29193c4ffe96492dd9e9b (diff) | |
| download | git-eb307ae7bb78ccde4e2ac69f302ccf8834883628.zip git-eb307ae7bb78ccde4e2ac69f302ccf8834883628.tar.gz git-eb307ae7bb78ccde4e2ac69f302ccf8834883628.tar.bz2 | |
merge/pull Check for untrusted good GPG signatures
When --verify-signatures is specified, abort the merge in case a good
GPG signature from an untrusted key is encountered.
Signed-off-by: Sebastian Götte <jaseg@physik-pool.tu-berlin.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 31f1067..a0f022b 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -85,8 +85,8 @@ option can be used to override --squash. --verify-signatures:: --no-verify-signatures:: - Verify that the commits being merged have good GPG signatures and abort the - merge in case they do not. + Verify that the commits being merged have good and trusted GPG signatures + and abort the merge in case they do not. --summary:: --no-summary:: |