diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-03-04 23:55:42 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-11 14:12:19 -0400 |
| commit | f0957589ee57cf5a98e4aa3ce742fb68c3e36f19 (patch) | |
| tree | ff10fdc5bbc4620986d4fac96f880a09d388b4b4 /include/git2 | |
| parent | 90f8408dacf0da9def636a042813822b078df735 (diff) | |
| download | libgit2-f0957589ee57cf5a98e4aa3ce742fb68c3e36f19.tar.gz | |
stash: refactor to use merge_iterators
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/stash.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/git2/stash.h b/include/git2/stash.h index f69ba307a..428d9f250 100644 --- a/include/git2/stash.h +++ b/include/git2/stash.h @@ -97,10 +97,9 @@ typedef enum { * the workdir and index will be left untouched. * * @param repo The owning repository. - * * @param index The position within the stash list. 0 points to the - * most recent stashed state. - * + * most recent stashed state. + * @param checkout_options Options to control how files are checked out * @param flags Flags to control the applying process. (see GIT_APPLY_* above) * * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the given @@ -109,6 +108,7 @@ typedef enum { GIT_EXTERN(int) git_stash_apply( git_repository *repo, size_t index, + const git_checkout_options *checkout_options, unsigned int flags); /** @@ -167,10 +167,9 @@ GIT_EXTERN(int) git_stash_drop( * if successful. * * @param repo The owning repository. - * * @param index The position within the stash list. 0 points to the - * most recent stashed state. - * + * most recent stashed state. + * @param checkout_options Options to control how files are checked out * @param flags Flags to control the applying process. (see GIT_APPLY_* above) * * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the given @@ -179,6 +178,7 @@ GIT_EXTERN(int) git_stash_drop( GIT_EXTERN(int) git_stash_pop( git_repository *repo, size_t index, + const git_checkout_options *checkout_options, unsigned int flags); /** @} */ |