diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-05 14:15:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-05 14:15:16 -0700 |
| commit | d5fec92a7af5c42217f3d1c707191791230bdefc (patch) | |
| tree | 772e89712d4247cae1c934408e4af0e6862e8914 /Documentation/git-mergetool.txt | |
| parent | Merge branch 'jl/submodule-deinit' (diff) | |
| parent | pretty printing: extend %G? to include 'N' and 'U' (diff) | |
| download | tgif-d5fec92a7af5c42217f3d1c707191791230bdefc.tar.xz | |
Merge branch 'sg/gpg-sig'
Teach "merge/pull" to optionally verify and reject commits that are
not signed properly.
* sg/gpg-sig:
pretty printing: extend %G? to include 'N' and 'U'
merge/pull Check for untrusted good GPG signatures
merge/pull: verify GPG signatures of commits being merged
commit.c/GPG signature verification: Also look at the first GPG status line
Move commit GPG signature verification to commit.c
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions