proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-14 11:43:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Doc fixes

Browse Source
This commit is contained in:
Russell Belfer 2014-05-02 15:15:43 -07:00
parent 272b462db7
commit d2c16e9ac4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/git2/merge.h
View File

@ -61,7 +61,7 @@ GIT_EXTERN(int) git_merge_file_init_input(
/**
* Flags for `git_merge_tree` options. A combination of these flags can be
* passed in via the `flags` value in the `git_merge_tree_opts`.
* passed in via the `flags` value in the `git_merge_options`.
*/
typedef enum {
/**
@ -73,7 +73,7 @@ typedef enum {
} git_merge_tree_flag_t;
/**
* Merge file favor options for `git_merge_trees_opts` instruct the file-level
* Merge file favor options for `git_merge_options` instruct the file-level
* merging functionality how to deal with conflicting regions of the files.
*/
typedef enum {

5
include/git2/object.h
View File

@ -107,6 +107,11 @@ GIT_EXTERN(const git_oid *) git_object_id(const git_object *obj);
/**
* Get a short abbreviated OID string for the object
*
* This starts at the "core.abbrev" length (default 7 characters) and
* iteratively extends to a longer string if that length is ambiguous.
* The result will be unambiguous (at least until new objects are added to
* the repository).
*
* @param out Buffer to write string into
* @param obj The object to get an ID for
* @return 0 on success, <0 for error