summaryrefslogtreecommitdiff
path: root/t/t3309-notes-merge-auto-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-18 14:19:01 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-18 14:19:01 +0900
commit501ec0dad31a5379ac7620f8655de882844fd3c1 (patch)
treef70bdfbae0b2f99e4aa1b278bd22b72609c3487c /t/t3309-notes-merge-auto-resolve.sh
parentMerge branch 'mh/for-each-string-list-item-empty-fix' into maint (diff)
parentdescribe: fix matching to actually match all patterns (diff)
downloadtgif-501ec0dad31a5379ac7620f8655de882844fd3c1.tar.xz
Merge branch 'jk/describe-omit-some-refs' into maint
"git describe --match" learned to take multiple patterns in v2.13 series, but the feature ignored the patterns after the first one and did not work at all. This has been fixed. * jk/describe-omit-some-refs: describe: fix matching to actually match all patterns
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions