aboutsummaryrefslogtreecommitdiff
path: root/Documentation/pretty-formats.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-21 14:02:55 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-21 14:02:55 -0700
commit0f6875dbe2598fd2e9a597a9e42cde4a507140dd (patch)
tree9934b604245af8bb26f1c9b2c8198a6c46a34284 /Documentation/pretty-formats.txt
parentdcf0d12aed0d4627dcbfdbc52cea75ce74103e46 (diff)
parent0174eeaa736226a0bea19e9bf88c270d61aa9cce (diff)
downloadgit-0f6875dbe2598fd2e9a597a9e42cde4a507140dd.tar.gz
git-0f6875dbe2598fd2e9a597a9e42cde4a507140dd.tar.xz
Merge branch 'mg/gpg-interface-using-status'
Call "gpg" using the right API when validating the signature on tags. * 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.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 105f18a6f..293965524 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