commit | 5de89d3abfca98b0dfd0280d28576940c913d60d | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Fri Jan 06 12:44:07 2012 -0800 |
committer | Junio C Hamano <gitster@pobox.com> | Fri Jan 06 12:44:07 2012 -0800 |
tree | ce339497e72abc84f4a1bbc9b270b07ab46dbc0c | |
parent | 4a3a1edd0be1c5254ae4fc66e06297d87ef7d530 [diff] | |
parent | d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb [diff] |
Merge branch 'jc/show-sig' * jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c