| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 1 | -0/+1 |
| | | |||||
| * | merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t` | Edward Thomson | 2015-11-25 | 1 | -1/+1 |
| | | |||||
| * | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT | Edward Thomson | 2015-10-22 | 1 | -1/+17 |
| | | | | | | | Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which will stop on the first conflict and fail the merge operation with GIT_EMERGECONFLICT. | ||||
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -3/+3 |
| | | |||||
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -11/+0 |
| | | |||||
| * | index: rename an entry's id to 'id' | Carlos MartÃn Nieto | 2014-01-25 | 1 | -1/+1 |
| | | | | | This was not converted when we converted the rest, so do it now. | ||||
| * | Clean up warnings | Edward Thomson | 2013-12-09 | 1 | -22/+0 |
| | | |||||
| * | Bare naked merge and rebase | Edward Thomson | 2013-12-03 | 1 | -0/+164 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |