summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
AgeCommit message (Expand)AuthorFilesLines
2016-10-28Merge branch 'jk/merge-base-fork-point-without-reflog' into maintLibravatar Junio C Hamano1-0/+6
2016-10-12merge-base: handle --fork-point without reflogLibravatar Jeff King1-0/+6
2016-03-23merge: refuse to create too cool a merge by defaultLibravatar Junio C Hamano1-2/+4
2014-01-10Merge branch 'bm/merge-base-octopus-dedup'Libravatar Junio C Hamano1-0/+39
2013-12-30merge-base --octopus: reduce the result from get_octopus_merge_bases()Libravatar Junio C Hamano1-0/+39
2013-10-29merge-base: teach "--fork-point" modeLibravatar Junio C Hamano1-0/+28
2011-05-06tests: eliminate unnecessary setup test assertionsLibravatar Jonathan Nieder1-25/+25
2010-11-09tests: add missing &&Libravatar Jonathan Nieder1-1/+1
2010-08-18merge-base --independent to print reduced parent list in a mergeLibravatar Jonathan Nieder1-1/+38
2010-08-18merge-base --octopus to mimic show-branch --merge-baseLibravatar Jonathan Nieder1-0/+2
2010-08-18t6010 (merge-base): modernize styleLibravatar Jonathan Nieder1-143/+160
2009-08-05git-merge-base/git-show-branch --merge-base: Documentation and testLibravatar Michael J Gruber1-0/+6
2009-08-05t6010-merge-base.sh: Depict the octopus test graphLibravatar Michael J Gruber1-0/+12
2008-07-29merge-base-many: add trivial tests based on the documentationLibravatar Junio C Hamano1-0/+48
2008-05-05Don't use the 'export NAME=value' in the test scripts.Libravatar Bryan Donlan1-4/+5
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-12/+12
2007-06-26cleanup merge-base test scriptLibravatar Sam Vilain1-12/+18
2006-07-09Additional merge-base tests (revised)Libravatar A Large Angry SCM1-0/+45
2006-01-11name-rev: do not omit leading components of ref name.Libravatar Junio C Hamano1-3/+3
2005-11-11Add test case for merge-base.Libravatar Junio C Hamano1-0/+59