summaryrefslogtreecommitdiff
path: root/builtin/ls-files.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-01-04 16:23:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-05 13:02:27 -0800
commitd041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (patch)
treeea6625d23c618e398d81f422fa04aad6d24c6c01 /builtin/ls-files.c
parentlog-tree: show mergetag in log --show-signature output (diff)
downloadtgif-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 'builtin/ls-files.c')
0 files changed, 0 insertions, 0 deletions