summaryrefslogtreecommitdiff
path: root/t/t6028-merge-up-to-date.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2015-03-20t: fix moderate &&-chain breakageJeff King
2012-04-18builtin/merge.c: reduce parents earlyJunio C Hamano
2012-04-18merge tests: octopus with redundant parentsMichaƂ Kiedrowicz
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2007-08-28git-merge: do up-to-date check also for all strategiesJunio C Hamano