summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <carlosmn@github.com>2016-03-22 00:44:05 -0700
committerCarlos Martín Nieto <carlosmn@github.com>2016-03-22 00:44:05 -0700
commitcec320fe874805b4af3ac14db3cfe6086e54c760 (patch)
treecc19b9a2454450e8cd1d67f07a546dc4b9d71f4d
parent7adca53ed653802663096b8c2977a03dbe39c601 (diff)
parent0b24855ea888cb225bf0eb11d2d063c899e8e616 (diff)
downloadlibgit2-cec320fe874805b4af3ac14db3cfe6086e54c760.tar.gz
Merge pull request #3701 from jfultz/fix-0.24.0-changelog
Fix some errors I found in the changelog for 0.24.0
-rw-r--r--CHANGELOG.md5
1 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e9ca156a..60e58403f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -122,12 +122,15 @@ v0.24
`GIT_CONFIG_LEVEL_PROGRAMDATA` which represent a rough Windows equivalent
to the system level configuration.
-* `git_rebase_init()` not also takes a merge options.
+* `git_rebase_options` now has a `merge_options` field.
* The index no longer performs locking itself. This is not something
users of the library should have been relying on as it's not part of
the concurrency guarantees.
+* `git_remote_connect()` now takes a `custom_headers` argument to set
+ the extra HTTP header fields to send.
+
v0.23
------