Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -1/+1 |
* | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -3/+3 |
* | Change signature of `git_merge` to take merge and checkout opts | Edward Thomson | 2014-03-20 | 1 | -1/+2 |
* | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -0/+43 |
* | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 1 | -0/+5 |
* | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+62 |