aboutsummaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
Commit message (Expand)AuthorAge
* Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2016-10-26
|\
| * merge-base: handle --fork-point without reflogJeff King2016-10-12
* | merge: refuse to create too cool a merge by defaultJunio C Hamano2016-03-23
|/
* Merge branch 'bm/merge-base-octopus-dedup'Junio C Hamano2014-01-10
|\
| * merge-base --octopus: reduce the result from get_octopus_merge_bases()Junio C Hamano2013-12-30
* | merge-base: teach "--fork-point" modeJunio C Hamano2013-10-29
|/
* tests: eliminate unnecessary setup test assertionsJonathan Nieder2011-05-06
* tests: add missing &&Jonathan Nieder2010-11-09
* merge-base --independent to print reduced parent list in a mergeJonathan Nieder2010-08-18
* merge-base --octopus to mimic show-branch --merge-baseJonathan Nieder2010-08-18
* t6010 (merge-base): modernize styleJonathan Nieder2010-08-18
* git-merge-base/git-show-branch --merge-base: Documentation and testMichael J Gruber2009-08-05
* t6010-merge-base.sh: Depict the octopus test graphMichael J Gruber2009-08-05
* merge-base-many: add trivial tests based on the documentationJunio C Hamano2008-07-29
* Don't use the 'export NAME=value' in the test scripts.Bryan Donlan2008-05-05
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* cleanup merge-base test scriptSam Vilain2007-06-26
* Additional merge-base tests (revised)A Large Angry SCM2006-07-09
* name-rev: do not omit leading components of ref name.Junio C Hamano2006-01-11
* Add test case for merge-base.Junio C Hamano2005-11-11