summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-261-0/+6
|\
| * merge-base: handle --fork-point without reflogjk/merge-base-fork-point-without-reflogJeff King2016-10-121-0/+6
* | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-231-2/+4
|/
* Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-101-0/+39
|\
| * merge-base --octopus: reduce the result from get_octopus_merge_bases()bm/merge-base-octopus-dedupJunio C Hamano2013-12-301-0/+39
* | merge-base: teach "--fork-point" modejc/merge-base-reflogJunio C Hamano2013-10-291-0/+28
|/
* tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-061-25/+25
* tests: add missing &&Jonathan Nieder2010-11-091-1/+1
* merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-181-1/+38
* merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-181-0/+2
* t6010 (merge-base): modernize styleJonathan Nieder2010-08-181-143/+160
* git-merge-base/git-show-branch --merge-base: Documentation and testMichael J Gruber2009-08-051-0/+6
* t6010-merge-base.sh: Depict the octopus test graphMichael J Gruber2009-08-051-0/+12
* merge-base-many: add trivial tests based on the documentationJunio C Hamano2008-07-291-0/+48
* Don't use the 'export NAME=value' in the test scripts.Bryan Donlan2008-05-051-4/+5
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-12/+12
* cleanup merge-base test scriptSam Vilain2007-06-261-12/+18
* Additional merge-base tests (revised)A Large Angry SCM2006-07-091-0/+45
* name-rev: do not omit leading components of ref name.Junio C Hamano2006-01-111-3/+3
* Add test case for merge-base.Junio C Hamano2005-11-111-0/+59
View Lorry Controller Status