diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-05 21:15:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-05 21:15:16 (GMT) |
| commit | d5fec92a7af5c42217f3d1c707191791230bdefc (patch) | |
| tree | 772e89712d4247cae1c934408e4af0e6862e8914 /Documentation/merge-options.txt | |
| parent | 7b72ec5e14656af2d48c7a2a0b7251c35903bbaf (diff) | |
| parent | e290c4b944f109aff26cc3db4ae0aec92f3cc126 (diff) | |
| download | git-d5fec92a7af5c42217f3d1c707191791230bdefc.zip git-d5fec92a7af5c42217f3d1c707191791230bdefc.tar.gz git-d5fec92a7af5c42217f3d1c707191791230bdefc.tar.bz2 | |
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/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 34a8445..2adccf8 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -84,6 +84,11 @@ option can be used to override --squash. Pass merge strategy specific option through to the merge strategy. +--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. + --summary:: --no-summary:: Synonyms to --stat and --no-stat; these are deprecated and will be |