tree ea6625d23c618e398d81f422fa04aad6d24c6c01
parent 824958e50b250e957998626a21763603ca30e832
author Junio C Hamano <gitster@pobox.com> 1325722992 -0800
committer Junio C Hamano <gitster@pobox.com> 1325797347 -0800

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>