From 31c7829954c376b419f5ab318c4a00628a0002d3 Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 3 Jan 2017 10:11:52 +0000 Subject: [PATCH 1/2] mention field addition in breaking API changes --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8544ac451..69ebd3a2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -150,7 +150,8 @@ 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. v0.24 ------- From d8f984bc4980a491ffc61dcfdd57bed27c34ff0d Mon Sep 17 00:00:00 2001 From: Simon Byrne Date: Tue, 3 Jan 2017 10:54:24 +0000 Subject: [PATCH 2/2] move git_merge_options changes to correct location --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ebd3a2b..3a8db068f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -153,6 +153,10 @@ v0.25 * `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 ------- @@ -228,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