summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-04 16:23:12 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-05 13:02:27 -0800
commitd041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb (patch)
treeea6625d23c618e398d81f422fa04aad6d24c6c01 /notes-merge.c
parent824958e50b250e957998626a21763603ca30e832 (diff)
downloadgit-d041ffa55a69cb6cdc3b160dc181c7e59b3bd4bb.tar.gz
log --show-signature: reword the common two-head merge casejc/show-sig
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 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions