| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Renamed git_merge_options 'flags' to 'tree_flags' | Jacques Germishuys | 2015-03-16 | 1 | -3/+3 |
| * | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -11/+3 |
| * | 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 | -13/+14 |
| * | Prevent user's merge.conflictstyle from breaking tests | Ben Straub | 2014-02-05 | 1 | -0/+7 |
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+156 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |