| commit | d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Jan 2012 00:23:12 +0000 (4 16:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Jan 2012 21:02:27 +0000 (5 13:02 -0800) | ||
| tree | ea6625d23c618e398d81f422fa04aad6d24c6c01 | treesnapshot (tar.gz zip) |
| parent | 824958e50b250e957998626a21763603ca30e832 | commitdiff |
log --show-signature: reword the common two-head merge case
While identifying the commit merged to our history as "parent #2" is
technically correct, we will never say "parent #1" (as that is the tip of
our history before the merge is made), and we rarely would say "parent #3"
(which would mean the merge is an octopus), especially when responding to
a request to pull a signed tag.
Treat the most common case to merge a single commit specially, and just
say "merged tag '<tagname>'" instead.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
While identifying the commit merged to our history as "parent #2" is
technically correct, we will never say "parent #1" (as that is the tip of
our history before the merge is made), and we rarely would say "parent #3"
(which would mean the merge is an octopus), especially when responding to
a request to pull a signed tag.
Treat the most common case to merge a single commit specially, and just
say "merged tag '<tagname>'" instead.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| log-tree.c | diffblobblamehistory |