| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | stash: const up conflict params | Edward Thomson | 2015-06-29 | 1 | -1/+1 |
| | | |||||
| * | stash: test we apply using reflog-like indices | Edward Thomson | 2015-06-26 | 1 | -0/+34 |
| | | |||||
| * | stash: stage new files when unstashing them | Edward Thomson | 2015-06-25 | 1 | -2/+50 |
| | | | | | | Files that were new (staged additions) in the stash tree should be staged when unstashing, even when not applying the index. | ||||
| * | stash: don't allow apply with staged changes | Edward Thomson | 2015-06-25 | 1 | -1/+18 |
| | | |||||
| * | stash apply: add a newly staged file to tests | Edward Thomson | 2015-06-25 | 1 | -8/+19 |
| | | |||||
| * | Fixed index being double-freed in stash tests | Pierre-Olivier Latour | 2015-06-20 | 1 | -2/+0 |
| | | |||||
| * | Fixed build warnings on Xcode 6.1 | Pierre-Olivier Latour | 2015-06-02 | 1 | -1/+7 |
| | | |||||
| * | Rename GIT_EMERGECONFLICT to GIT_ECONFLICT | Edward Thomson | 2015-05-29 | 1 | -5/+5 |
| | | | | | | | | | | | We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This *may* happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout. | ||||
| * | Fix a few leaks | Carlos MartÃn Nieto | 2015-05-13 | 1 | -0/+2 |
| | | | | | | The interesting one is the notification macro, which was returning directly on a soft-abort instead of going through the cleanup. | ||||
| * | stash_apply: provide progress callbacks | Edward Thomson | 2015-05-11 | 1 | -0/+45 |
| | | |||||
| * | stash_apply: provide its own options structure | Edward Thomson | 2015-05-11 | 1 | -17/+38 |
| | | |||||
| * | stash: test checkout notify callbacks | Edward Thomson | 2015-05-11 | 1 | -0/+52 |
| | | |||||
| * | stash: return GIT_EMERGECONFLICT on merge conflict | Edward Thomson | 2015-05-11 | 1 | -1/+1 |
| | | |||||
| * | stash: refactor to use merge_iterators | Edward Thomson | 2015-05-11 | 1 | -12/+12 |
| | | |||||
| * | stash apply: check out a tree, not piecewise | Edward Thomson | 2015-05-11 | 1 | -2/+2 |
| | | |||||
| * | Added git_stash_apply() and git_stash_pop() APIs | Pierre-Olivier Latour | 2015-05-11 | 1 | -0/+215 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |