diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-18 14:50:06 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-10-26 22:59:21 -0400 |
| commit | 93a7004cc234da31d912bb0f266c39b99ab8c8db (patch) | |
| tree | 06fc49a4dda32a64a77e221f6ebe7109d1754d1b /include/git2/rebase.h | |
| parent | a35a9890b00b538cd0f3ef94a526c0dd2ec461bf (diff) | |
| download | libgit2-93a7004cc234da31d912bb0f266c39b99ab8c8db.tar.gz | |
git_rebase_commit: drop already-picked commits
Already cherry-picked commits should not be re-included. If all changes
included in a commit exist in the upstream, then we should error with
GIT_EAPPLIED.
Diffstat (limited to 'include/git2/rebase.h')
| -rw-r--r-- | include/git2/rebase.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/git2/rebase.h b/include/git2/rebase.h index 0fe2b263d..32b4ff614 100644 --- a/include/git2/rebase.h +++ b/include/git2/rebase.h @@ -99,7 +99,9 @@ GIT_EXTERN(int) git_rebase_next( * @param message The message for this commit, or NULL to keep the message * from the original commit * @return Zero on success, GIT_EUNMERGED if there are unmerged changes in - * the index, -1 on failure. + * the index, GIT_EAPPLIED if the current commit has already + * been applied to the upstream and there is nothing to commit, + * -1 on failure. */ GIT_EXTERN(int) git_rebase_commit( git_oid *id, |