| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Introduce git_merge__extract_conflict_paths | Jacques Germishuys | 2014-04-14 | 1 | -0/+2 |
| * | Remove `git_merge_result` as it's now unnecessary | Edward Thomson | 2014-03-20 | 1 | -10/+0 |
| * | Update git_merge_tree_opts to git_merge_options | Edward Thomson | 2014-03-20 | 1 | -1/+1 |
| * | Remove fastforward / uptodate from `git_merge` | Edward Thomson | 2014-03-20 | 1 | -3/+2 |
| * | Don't try to merge binary files | Edward Thomson | 2014-01-20 | 1 | -0/+2 |
| * | Introduce git_revert to revert a single commit | Edward Thomson | 2013-12-02 | 1 | -0/+2 |
| * | merge branch into current, updating workdir | Edward Thomson | 2013-11-05 | 1 | -0/+11 |
| * | move mode_t to filebuf_open instead of _commit | Edward Thomson | 2013-11-04 | 1 | -0/+1 |
| * | merge setup | Edward Thomson | 2013-05-17 | 1 | -0/+22 |
| * | Fix trailing whitespaces | nulltoken | 2013-05-15 | 1 | -18/+18 |
| * | Unify whitespaces to tabs | Linquize | 2013-05-15 | 1 | -14/+14 |
| * | merge! | Edward Thomson | 2013-04-30 | 1 | -5/+110 |
| * | update copyrights | Edward Thomson | 2013-01-08 | 1 | -1/+1 |
| * | MERGE_HEAD contents iterator | Edward Thomson | 2013-01-03 | 1 | -0/+1 |
| * | expose merge metadata cleanup | Edward Thomson | 2013-01-03 | 1 | -1/+0 |
| * | Move merge functions to merge.c | Ben Straub | 2012-11-27 | 1 | -0/+3 |
| * | reset changes for merge | Edward Thomson | 2012-10-24 | 1 | -0/+19 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |