Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | introduce `git_index_entry_is_conflict` | Edward Thomson | 2015-05-28 | 1 | -1/+1 |
* | Remove the signature from ref-modifying functions | Carlos Martín Nieto | 2015-03-03 | 1 | -1/+1 |
* | s/git_merge_head/git_annotated_commit | Edward Thomson | 2014-10-26 | 1 | -4/+4 |
* | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -3/+1 |
* | Change signature of `git_merge` to take merge and checkout opts | Edward Thomson | 2014-03-20 | 1 | -2/+1 |
* | git_checkout_opts -> git_checkout_options | Ben Straub | 2014-03-06 | 1 | -1/+1 |
* | index: rename an entry's id to 'id' | Carlos Martín Nieto | 2014-01-25 | 1 | -2/+2 |
* | Remove the "merge none" flag | Edward Thomson | 2014-01-20 | 1 | -90/+14 |
* | merge_file should use more aggressive levels | Edward Thomson | 2014-01-20 | 1 | -1/+1 |
* | refs: remove the _with_log differentiation | Carlos Martín Nieto | 2014-01-15 | 1 | -1/+1 |
* | Rename tests-clar to tests | Ben Straub | 2013-11-14 | 1 | -0/+341 |