summaryrefslogtreecommitdiff
path: root/t/t3033-merge-toplevel.sh
AgeCommit message (Expand)AuthorFilesLines
2020-04-10merge: teach --autostash optionLibravatar Denton Liu1-0/+22
2016-04-21t3033: avoid 'ambiguous refs' warningLibravatar Junio C Hamano1-1/+1
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano1-0/+16
2015-04-29merge: handle FETCH_HEAD internallyLibravatar Junio C Hamano1-5/+5
2015-04-29merge: test the top-level merge driverLibravatar Junio C Hamano1-0/+136