From 93a7004cc234da31d912bb0f266c39b99ab8c8db Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Fri, 18 Jul 2014 14:50:06 -0400 Subject: 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. --- include/git2/rebase.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/git2/rebase.h') 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, -- cgit v1.2.1