aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6028-merge-up-to-date.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2015-03-20t: fix moderate &&-chain breakageJeff King1-1/+1
2012-04-17builtin/merge.c: reduce parents earlyJunio C Hamano1-1/+1
2012-04-17merge tests: octopus with redundant parentsMichaƂ Kiedrowicz1-1/+16
2009-10-24Use 'fast-forward' all over the placeFelipe Contreras1-1/+1
2007-08-27git-merge: do up-to-date check also for all strategiesJunio C Hamano1-0/+77