Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not attempt to check out submodule as blob when merging a submodule modify... | David Turner | 2017-12-04 | 3 | -0/+3 |
* | merge_trees: introduce test for submodule renames | Edward Thomson | 2017-02-09 | 16 | -0/+7 |
* | Add `git_merge_status` to provide info about an upcoming merge | Edward Thomson | 2014-03-20 | 1 | -0/+1 |
* | Merge submodules | Edward Thomson | 2014-01-20 | 45 | -0/+44 |
* | Don't try to merge binary files | Edward Thomson | 2014-01-20 | 9 | -0/+3 |
* | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 408 | -0/+538 |