diff options
| author | Carlos MartÃn Nieto <carlosmn@github.com> | 2017-05-20 17:19:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-20 17:19:33 +0200 |
| commit | 8aa14743d9206c77c3556f4c1ab1ba7482cf48e8 (patch) | |
| tree | da7267732814aa201a894c9d7707532016ede1d3 | |
| parent | 2fcb8705e584ca61f6c4657525c9d2713f6a39d2 (diff) | |
| parent | 73bf857db166975c74611c5adfe5fb849fec0b60 (diff) | |
| download | libgit2-maint/v0.25.tar.gz | |
Merge pull request #4072 from libgit2/ethomson/025_relnotesmaint/v0.25
Backport #4065
| -rw-r--r-- | CHANGELOG.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8544ac451..3a8db068f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -150,7 +150,12 @@ v0.25 If this is `NULL`, then it will not be called and the `exists` function will be used instead. -* `git_remote_connect()` now accepts proxy options. +* `git_remote_connect()` now accepts `git_proxy_options` argument, and + `git_fetch_options` and `git_push_options` each have a `proxy_opts` field. + +* `git_merge_options` now provides a `default_driver` that can be used + to provide the name of a merge driver to be used to handle files changed + during a merge. v0.24 ------- @@ -227,10 +232,6 @@ v0.24 ### Breaking API changes -* `git_merge_options` now provides a `default_driver` that can be used - to provide the name of a merge driver to be used to handle files changed - during a merge. - * 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 |