diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-07-15 10:23:10 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-10-26 22:59:14 -0400 |
| commit | 950a70915930342d18286c6d6350929662a978e2 (patch) | |
| tree | ad7ce6126e0f1098cb4903605716f5b65ec74083 /include/git2/rebase.h | |
| parent | 4fe84d624b42a1ef1b9b392483ddc43064b1180e (diff) | |
| download | libgit2-950a70915930342d18286c6d6350929662a978e2.tar.gz | |
Introduce git_rebase_next
`git_rebase_next` will apply the next patch (or cherry-pick)
operation, leaving the results checked out in the index / working
directory so that consumers can resolve any conflicts, as appropriate.
Diffstat (limited to 'include/git2/rebase.h')
| -rw-r--r-- | include/git2/rebase.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/git2/rebase.h b/include/git2/rebase.h index c760fbe74..e4300ebf6 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -69,6 +69,19 @@ GIT_EXTERN(int) git_rebase( const git_rebase_options *opts); /** + * Applies the next patch, updating the index and working directory with the + * changes. If there are conflicts, you will need to address those before + * committing the changes. + * + * @param repo The repository with a rebase in progress + * @param checkout_opts Options to specify how the patch should be checked out + * @return Zero on success; -1 on failure. + */ +GIT_EXTERN(int) git_rebase_next( + git_repository *repo, + git_checkout_options *checkout_opts); + +/** * Aborts a rebase that is currently in progress, resetting the repository * and working directory to their state before rebase began. * |