diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-01-04 16:23:12 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-01-05 13:02:27 -0800 |
commit | d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (patch) | |
tree | ea6625d23c618e398d81f422fa04aad6d24c6c01 /commit.c | |
parent | 824958e50b250e957998626a21763603ca30e832 (diff) | |
download | git-d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb.tar.gz git-d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb.tar.xz |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions