Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-10 | 1 | -152/+0 |
* | Merge branch 'jk/merge-subtree-heuristics' | Junio C Hamano | 2018-08-17 | 1 | -0/+28 |
|\ | |||||
| * | score_trees(): fix iteration over trees with missing entries | Jeff King | 2018-08-02 | 1 | -0/+28 |
* | | t6000-t6999: fix broken &&-chains | Eric Sunshine | 2018-07-16 | 1 | -8/+8 |
|/ | |||||
* | merge: refuse to create too cool a merge by default | Junio C Hamano | 2016-03-23 | 1 | -1/+1 |
* | tests: add missing && | Jonathan Nieder | 2010-11-09 | 1 | -1/+1 |
* | Extend merge-subtree tests to test -Xsubtree=dir. | Avery Pennarun | 2010-01-17 | 1 | -1/+46 |
* | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 2008-05-24 | 1 | -2/+2 |
* | add test_cmp function for test scripts | Jeff King | 2008-03-13 | 1 | -1/+1 |
* | Improve t6029 to check the real "subtree" case | Miklos Vajna | 2008-02-29 | 1 | -0/+47 |
* | Add merge-subtree back | Junio C Hamano | 2008-02-23 | 1 | -0/+32 |