diff options
| author |  Stephen Boyd <bebarino@gmail.com> | 2012-09-20 01:10:38 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-09-20 10:28:51 -0700 |
| commit | f2fef7b55aea64104a6aee662817e1e6f0b22f71 (patch) | |
| tree | 146ec865c41dd0dcd5de6e99d80339f2393d3068 | |
| parent | completion: fix shell expansion of items (diff) | |
| download | tgif-f2fef7b55aea64104a6aee662817e1e6f0b22f71.tar.xz | |
Documentation: Document signature showing options
The pretty formats for GPG signatures were introduced but never
documented. Use the documentation from the commit that introduced them.
Do the same for the --show-signature option added to git log and
friends.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/pretty-formats.txt | 3 | ||||
| -rw-r--r-- | Documentation/pretty-options.txt | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index e3d8a83b23..d9eddedc72 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -130,6 +130,9 @@ The placeholders are: - '%b': body - '%B': raw body (unwrapped subject and body) - '%N': commit notes +- '%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 - '%gD': reflog selector, e.g., `refs/stash@{1}` - '%gd': shortened reflog selector, e.g., `stash@{1}` - '%gn': reflog identity name diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 2a3dc8664f..5e499421a4 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -66,3 +66,7 @@ being displayed. Examples: "--notes=foo" will show only notes from --[no-]standard-notes:: These options are deprecated. Use the above --notes/--no-notes options instead. + +--show-signature:: + Check the validity of a signed commit object by passing the signature + to `gpg --verify` and show the output. |