diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:45 -0700 |
| commit | 56d268bafff7538f82c01d3c9c07bdc54b2993b1 (patch) | |
| tree | 3ea9958f7aa260206a186b3a198b3e279141ae31 /Documentation | |
| parent | a03973893bdbc1a53c705daf70a73994ac46492f (diff) | |
| parent | 661a1806819ca98c446f82b19e6c98fa174d33a4 (diff) | |
| download | git-56d268bafff7538f82c01d3c9c07bdc54b2993b1.tar.gz git-56d268bafff7538f82c01d3c9c07bdc54b2993b1.tar.xz | |
Merge branch 'mg/gpg-richer-status'
The GPG verification status shown in "%G?" pretty format specifier
was not rich enough to differentiate a signature made by an expired
key, a signature made by a revoked key, etc. New output letters
have been assigned to express them.
* mg/gpg-richer-status:
gpg-interface: use more status letters
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/pretty-formats.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 69c289dd0..3bcee2ddb 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -143,8 +143,14 @@ ifndef::git-rev-list[] - '%N': commit notes endif::git-rev-list[] - '%GG': raw verification message from GPG for a signed commit -- '%G?': show "G" for a good (valid) signature, "B" for a bad signature, - "U" for a good signature with unknown validity and "N" for no signature +- '%G?': show "G" for a good (valid) signature, + "B" for a bad signature, + "U" for a good signature with unknown validity, + "X" for a good signature that has expired, + "Y" for a good signature made by an expired key, + "R" for a good signature made by a revoked key, + "E" if the signature cannot be checked (e.g. missing key) + and "N" for no signature - '%GS': show the name of the signer for a signed commit - '%GK': show the key used to sign a signed commit - '%gD': reflog selector, e.g., `refs/stash@{1}` or |