proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-04 03:14:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update documentation for API changes

Browse Source
This commit is contained in:
Jameson Miller 2015-04-30 10:57:13 -04:00
parent 891cc5045f
commit bf2ba5290a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -67,6 +67,8 @@ support for HTTPS connections insead of OpenSSL.
### Breaking API changes ### Breaking API changes
* `git_smart_subtransport_cb` now has a `param` parameter.
* The `git_merge_options` structure member `flags` has been renamed * The `git_merge_options` structure member `flags` has been renamed
to `tree_flags`. to `tree_flags`.

3
include/git2/merge.h
View File

@ -169,7 +169,7 @@ typedef struct {
/** The file to favor in region conflicts. */ /** The file to favor in region conflicts. */
git_merge_file_favor_t favor; git_merge_file_favor_t favor;
/** Merge file flags. */ /** see `git_merge_file_flags_t` above */
unsigned int flags; unsigned int flags;
} git_merge_file_options; } git_merge_file_options;
@ -246,6 +246,7 @@ typedef struct {
/** Flags for handling conflicting content. */ /** Flags for handling conflicting content. */
git_merge_file_favor_t file_favor; git_merge_file_favor_t file_favor;
/** see `git_merge_file_flags_t` above */
unsigned int file_flags; unsigned int file_flags;
} git_merge_options; } git_merge_options;