Carlos Martín Nieto
|
3e529e9d2d
|
Fix a few leaks
The interesting one is the notification macro, which was returning
directly on a soft-abort instead of going through the cleanup.
|
2015-05-13 16:40:18 +02:00 |
|
Edward Thomson
|
4ea3eebf4b
|
stash_apply: provide progress callbacks
|
2015-05-11 14:12:42 -04:00 |
|
Edward Thomson
|
19c80a6fd1
|
stash_apply: provide its own options structure
|
2015-05-11 14:12:39 -04:00 |
|
Edward Thomson
|
249616685e
|
stash: test checkout notify callbacks
|
2015-05-11 14:12:35 -04:00 |
|
Edward Thomson
|
f78bb2afb3
|
stash: return GIT_EMERGECONFLICT on merge conflict
|
2015-05-11 14:12:27 -04:00 |
|
Edward Thomson
|
f0957589ee
|
stash: refactor to use merge_iterators
|
2015-05-11 14:12:19 -04:00 |
|
Edward Thomson
|
d0dd3fcee7
|
stash apply: check out a tree, not piecewise
|
2015-05-11 14:12:12 -04:00 |
|
Pierre-Olivier Latour
|
bf8dd3f53d
|
Added git_stash_apply() and git_stash_pop() APIs
|
2015-05-11 14:11:53 -04:00 |
|