| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: lock the index at the start of the merge | Edward Thomson | 2015-02-14 | 1 | -0/+49 |
| * | merge test: test an actual failure, not conflict | Edward Thomson | 2015-02-13 | 1 | -6/+5 |
| * | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 1 | -236/+236 |
| * | Introduce git_merge_head_id | Edward Thomson | 2014-03-31 | 1 | -0/+27 |
| * | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -6/+2 |
| * | Change signature of `git_merge` to take merge and checkout opts | Edward Thomson | 2014-03-20 | 1 | -4/+2 |
| * | Remove fastforward / uptodate from `git_merge` | Edward Thomson | 2014-03-20 | 1 | -77/+47 |
| * | merge: rename _oid() -> id() | Carlos MartÃn Nieto | 2014-01-25 | 1 | -39/+39 |
| * | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+1057 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |