Commit cec320fe874805b4af3ac14db3cfe6086e54c760

Carlos Martín Nieto 2016-03-22T00:44:05

Merge pull request #3701 from jfultz/fix-0.24.0-changelog Fix some errors I found in the changelog for 0.24.0

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e9ca15..60e5840 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
 ------