diff options
| -rw-r--r-- | CHANGELOG.md | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 28382fa6d..94b28b12f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,8 +59,17 @@ v0.26 + 1 * When using SSH-based transports, we now repeatedly ask for the passphrase to decrypt the private key in case a wrong passphrase is being provided. +* When generating conflict markers, they will now use the same line endings as + the rest of the file. + ### API additions +* The `git_merge_file_options` structure now contains a new setting, + `marker_size`. This allows users to set the size of markers that + delineate the sides of merged files in the output conflict file. + By default this is 7 (`GIT_MERGE_CONFLICT_MARKER_SIZE`), which + produces output markers like `<<<<<<<` and `>>>>>>>`. + * `git_remote_create_detached()` creates a remote that is not associated to any repository (and does not apply configuration like 'insteadof' rules). This is mostly useful for e.g. emulating `git ls-remote` behavior. @@ -80,12 +89,6 @@ v0.26 + 1 ### Breaking API changes -* The `git_merge_file_options` structure now contains a new setting, - `marker_size`. This allows users to set the size of markers that - delineate the sides of merged files in the output conflict file. - By default this is 7 (`GIT_MERGE_CONFLICT_MARKER_SIZE`), which - produces output markers like `<<<<<<<` and `>>>>>>>`. - * Signatures now distinguish between +0000 and -0000 UTC offsets. * The certificate check callback in the WinHTTP transport will now receive the @@ -95,6 +98,12 @@ v0.26 + 1 * We now refuse creating branches named "HEAD". +* We now refuse reading and writing all-zero object IDs into the + object database. + +* We now read the effective user's configuration file instead of the real user's + configuration in case libgit2 runs as part of a setuid binary. + v0.26 ----- |