diff options
| author | Ben Straub <bstraub@github.com> | 2012-06-05 12:52:44 -0700 |
|---|---|---|
| committer | Ben Straub <bstraub@github.com> | 2012-06-05 12:52:44 -0700 |
| commit | 56a5000d580ef5c9605bc9076610b5af9aa67518 (patch) | |
| tree | 4026c8333991fbe221a17b5d16e5e4b52f66cb20 /include/git2/object.h | |
| parent | e267c9fc1a4910d1081e97b4d7a411658ddc0def (diff) | |
| parent | 01dbe273c9b6f86a613b67cee27212cf4bacf4c0 (diff) | |
| download | libgit2-56a5000d580ef5c9605bc9076610b5af9aa67518.tar.gz | |
Merge branch 'development' into rev-parse
Conflicts:
src/util.h
tests-clar/refs/branches/listall.c
Diffstat (limited to 'include/git2/object.h')
| -rw-r--r-- | include/git2/object.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/git2/object.h b/include/git2/object.h index 859d0c4a4..414325121 100644 --- a/include/git2/object.h +++ b/include/git2/object.h @@ -21,7 +21,7 @@ GIT_BEGIN_DECL /** - * Lookup a reference to one of the objects in a repostory. + * Lookup a reference to one of the objects in a repository. * * The generated reference is owned by the repository and * should be closed with the `git_object_free` method @@ -45,7 +45,7 @@ GIT_EXTERN(int) git_object_lookup( git_otype type); /** - * Lookup a reference to one of the objects in a repostory, + * Lookup a reference to one of the objects in a repository, * given a prefix of its identifier (short id). * * The object obtained will be so that its identifier @@ -69,7 +69,7 @@ GIT_EXTERN(int) git_object_lookup( * @param id a short identifier for the object * @param len the length of the short identifier * @param type the type of the object - * @return GIT_SUCCESS or an error code + * @return 0 or an error code */ GIT_EXTERN(int) git_object_lookup_prefix( git_object **object_out, @@ -114,7 +114,7 @@ GIT_EXTERN(git_repository *) git_object_owner(const git_object *obj); * This method instructs the library to close an existing * object; note that git_objects are owned and cached by the repository * so the object may or may not be freed after this library call, - * depending on how agressive is the caching mechanism used + * depending on how aggressive is the caching mechanism used * by the repository. * * IMPORTANT: |