diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/errors.h | 1 | ||||
| -rw-r--r-- | include/git2/remote.h | 12 |
2 files changed, 2 insertions, 11 deletions
diff --git a/include/git2/errors.h b/include/git2/errors.h index 9e0a1a9e6..917f0699c 100644 --- a/include/git2/errors.h +++ b/include/git2/errors.h @@ -31,6 +31,7 @@ enum { GIT_EUNMERGED = -10, GIT_ENONFASTFORWARD = -11, GIT_EINVALIDSPEC = -12, + GIT_EMERGECONFLICT = -13, GIT_PASSTHROUGH = -30, GIT_ITEROVER = -31, diff --git a/include/git2/remote.h b/include/git2/remote.h index a0f5d5246..b92a0cd04 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -60,7 +60,7 @@ GIT_EXTERN(int) git_remote_create( * See `git_tag_create()` for rules about valid names. * * @param out pointer to the new remote object - * @param repo the associated repository. May be NULL for a "dangling" remote. + * @param repo the associated repository * @param fetch the fetch refspec to use for this remote. May be NULL for defaults. * @param url the remote repository's URL * @return 0 or an error code @@ -72,16 +72,6 @@ GIT_EXTERN(int) git_remote_create_inmemory( const char *url); /** - * Sets the owning repository for the remote. This is only allowed on - * dangling remotes. - * - * @param remote the remote to configure - * @param repo the repository that will own the remote - * @return 0 or an error code - */ -GIT_EXTERN(int) git_remote_set_repository(git_remote *remote, git_repository *repo); - -/** * Get the information for a particular remote * * The name will be checked for validity. |