Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t1000-t1999: fix broken &&-chains | Eric Sunshine | 2018-07-16 | 1 | -5/+5 |
* | t1005: add test for "read-tree --reset -u A B"jk/two-way-merge-corner-case-fix | Junio C Hamano | 2013-11-04 | 1 | -0/+15 |
* | t1005: reindent | Junio C Hamano | 2013-11-04 | 1 | -63/+63 |
* | Teach read-tree the -n|--dry-run option | Jens Lehmann | 2011-05-25 | 1 | -6/+7 |
* | reset --hard/read-tree --reset -u: remove unmerged new paths | Junio C Hamano | 2008-10-18 | 1 | -0/+60 |
* | add test_cmp function for test scripts | Jeff King | 2008-03-13 | 1 | -1/+1 |
* | Make 'unpack_trees()' have a separate source and destination index | Linus Torvalds | 2008-03-09 | 1 | -1/+1 |
* | Add a test for read-tree -u --reset with a D/F conflict | Jeff King | 2008-03-08 | 1 | -0/+30 |