diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:26:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:26:27 -0700 |
| commit | b771d8d7cf9dd9d5901e68526be471722870a9f8 (patch) | |
| tree | e1035ced0b988881dfede8fc5556575e78ab090f /Documentation/pretty-formats.txt | |
| parent | 14c79b1faa113707d8955912af6064d9844f71eb (diff) | |
| parent | 0174eeaa736226a0bea19e9bf88c270d61aa9cce (diff) | |
| download | git-b771d8d7cf9dd9d5901e68526be471722870a9f8.tar.gz | |
Merge branch 'mg/gpg-interface-using-status' into maint
Verification of signed tags were not done correctly when not in C
or en/US locale.
* mg/gpg-interface-using-status:
pretty: make %GK output the signing key for signed commits
pretty: parse the gpg status lines rather than the output
gpg_interface: allow to request status return
log-tree: rely upon the check in the gpg_interface
gpg-interface: check good signature in a reliable way
Diffstat (limited to 'Documentation/pretty-formats.txt')
| -rw-r--r-- | Documentation/pretty-formats.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 105f18a6f9..293965524e 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -133,6 +133,7 @@ The placeholders are: - '%GG': raw verification message from GPG for a signed commit - '%G?': show either "G" for Good or "B" for Bad for a signed commit - '%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}` - '%gd': shortened reflog selector, e.g., `stash@{1}` - '%gn': reflog identity name |