summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-09 13:30:19 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-09 13:30:19 -0700
commitfaf8fde514df5b5ddd529ec5a89973f1961c5281 (patch)
tree5f91a566720515dd386c97b16e7e43f9cbb03102 /mergetools
parent9b795193a6a7e963db62d9cd8e86752a40940520 (diff)
parent7c0b0d8deae040969d78eb141d899e225f1577e6 (diff)
downloadgit-faf8fde514df5b5ddd529ec5a89973f1961c5281.tar.gz
Merge branch 'mv/sequencer-pick-error-diag'
Fix "git cherry-pick $annotated_tag", which was mistakenly rejected. * mv/sequencer-pick-error-diag: cherry-pick: picking a tag that resolves to a commit is OK
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions