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/errors.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/errors.h')
| -rw-r--r-- | include/git2/errors.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h index 5dfa72ab8..b33118e02 100644 --- a/include/git2/errors.h +++ b/include/git2/errors.h @@ -43,6 +43,7 @@ typedef enum { GIT_EMODIFIED = -15, /**< Reference value does not match expected */ GIT_EAUTH = -16, /**< Authentication error */ GIT_ECERTIFICATE = -17, /**< Server certificate is invalid */ + GIT_EAPPLIED = -18, /**< Patch/merge has already been applied */ GIT_PASSTHROUGH = -30, /**< Internal only */ GIT_ITEROVER = -31, /**< Signals end of iteration with iterator */ |