diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 17:00:09 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:05 -0500 |
| commit | fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3 (patch) | |
| tree | 53dbcd502af2400529a3f8db828612d90d12cf06 /CHANGELOG.md | |
| parent | c4f60543b7ccfce852ebdc8c12b62c99a5d4c2a5 (diff) | |
| download | libgit2-fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3.tar.gz | |
merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d5a4166a..196ad705a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,14 @@ v0.23 + 1 ### Breaking API changes +* The `git_merge_tree_flag_t` is now `git_merge_flag_t`. Subsequently, + its members are no longer prefixed with `GIT_MERGE_TREE_FLAG` but are + now prefixed with `GIT_MERGE_FLAG`, and the `tree_flags` field of the + `git_merge_options` structure is now named `flags`. + +* The `git_merge_file_flags_t` enum is now `git_merge_file_flag_t` for + consistency with other enum type names. + * `git_cert` descendent types now have a proper `parent` member * It is the responsibility of the refdb backend to decide what to do |