Sunbelt Computer Software

PL/B Language Development and Support

Stash apply by ethomson · Pull Request #3018 · libgit2/libgit2 · GitHub

Stash apply#3018

Merged

carlosmn merged 17 commits into

libgit2:masterfrom

ethomson:stash_apply

May 12, 2015

Commits on May 11, 2015

Added git_stash_apply() and git_stash_pop() APIs

swisspol
authored and
Edward Thomson
committed
merge: merge iterators
Edward Thomson
committed
checkout: allow baseline to be specified as index
Edward Thomson
committed
index: introduce git_index_read_index
Edward Thomson
committed
stash: use git_commit_summary for a summary
Edward Thomson
committed
stash apply: check out a tree, not piecewise
Edward Thomson
committed
stash: ensure a reflog has entries
Edward Thomson
committed
stash: refactor to use merge_iterators
Edward Thomson
committed
stash: document merge conflicts
Edward Thomson
committed
stash: return GIT_EMERGECONFLICT on merge conflict
Edward Thomson
committed
stash apply: default to at least GIT_CHECKOUT_SAFE
Edward Thomson
committed
stash: test checkout notify callbacks
Edward Thomson
committed
stash_apply: provide its own options structure
Edward Thomson
committed
stash_apply: provide progress callbacks
Edward Thomson
committed
stash: propagate the error when writing a tree
Edward Thomson
committed
stash application: document new API in CHANGELOG
Edward Thomson
committed
checkout: better document the `baseline_index` opt
Edward Thomson
committed