summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
AgeCommit message (Expand)Author
2018-07-16t6000-t6999: fix broken &&-chainsEric Sunshine
2018-05-23t: make many tests depend less on the refs being filesDavid Turner
2016-10-26Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano
2016-10-12merge-base: handle --fork-point without reflogJeff King
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano
2014-01-10Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano
2013-12-30merge-base --octopus: reduce the result from get_octopus_merge_bases()Junio C Hamano
2013-10-29merge-base: teach "--fork-point" modeJunio C Hamano
2011-05-06tests: eliminate unnecessary setup test assertionsJonathan Nieder
2010-11-09tests: add missing &&Jonathan Nieder
2010-08-18merge-base --independent to print reduced parent list in a mergeJonathan Nieder
2010-08-18merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder
2010-08-18t6010 (merge-base): modernize styleJonathan Nieder
2009-08-05git-merge-base/git-show-branch --merge-base: Documentation and testMichael J Gruber
2009-08-05t6010-merge-base.sh: Depict the octopus test graphMichael J Gruber
2008-07-30merge-base-many: add trivial tests based on the documentationJunio C Hamano
2008-05-05Don't use the 'export NAME=value' in the test scripts.Bryan Donlan
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-27cleanup merge-base test scriptSam Vilain
2006-07-09Additional merge-base tests (revised)A Large Angry SCM
2006-01-11name-rev: do not omit leading components of ref name.Junio C Hamano
2005-11-11Add test case for merge-base.Junio C Hamano