diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-03-17 11:47:16 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-04-20 16:22:49 -0400 |
| commit | 5ae38538c6dd88cca058fac1b84e29df4fed60e4 (patch) | |
| tree | 2d8290d9185618af3c16791278ed6d029bf31cad /include | |
| parent | 649834fd6edd5ee2f7cb3e791081b2d57a4d7c41 (diff) | |
| download | libgit2-5ae38538c6dd88cca058fac1b84e29df4fed60e4.tar.gz | |
rebase: take `checkout_options` where appropriate
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/rebase.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/git2/rebase.h b/include/git2/rebase.h index 3d8d180a5..8171682e4 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -143,6 +143,8 @@ GIT_EXTERN(int) git_rebase_init_options( * @param onto The branch to rebase onto, or NULL to rebase onto the given * upstream * @param opts Options to specify how rebase is performed + * @param checkout_opts Options to specify how the checkout to the `onto` + * branch is performed * @return Zero on success; -1 on failure. */ GIT_EXTERN(int) git_rebase_init( @@ -151,7 +153,8 @@ GIT_EXTERN(int) git_rebase_init( const git_annotated_commit *branch, const git_annotated_commit *upstream, const git_annotated_commit *onto, - const git_rebase_options *opts); + const git_rebase_options *opts, + const git_checkout_options *checkout_opts); /** * Opens an existing rebase that was previously started by either an @@ -245,10 +248,14 @@ GIT_EXTERN(int) git_rebase_commit( * and working directory to their state before rebase began. * * @param rebase The rebase that is in-progress + * @param checkout_opts The checkout options that will be used to influence a + * hard reset of the working directory. * @return Zero on success; GIT_ENOTFOUND if a rebase is not in progress, * -1 on other errors. */ -GIT_EXTERN(int) git_rebase_abort(git_rebase *rebase); +GIT_EXTERN(int) git_rebase_abort( + git_rebase *rebase, + const git_checkout_options *checkout_opts); /** * Finishes a rebase that is currently in progress once all patches have |