diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-12-24 22:52:23 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 11:02:27 -0400 |
| commit | 30a94ab75687ae52ad4f9081831110b10dbd82ca (patch) | |
| tree | d2dc61662c273c628218c9d2749c3c839f40d3eb /CHANGELOG.md | |
| parent | 7d307c1edc5430dce270302d539d6eab8ed054c7 (diff) | |
| download | libgit2-30a94ab75687ae52ad4f9081831110b10dbd82ca.tar.gz | |
merge driver: allow custom default driver
Allow merge users to configure a custom default merge driver via
`git_merge_options`. Similarly, honor the `merge.default` configuration
option.
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 21f972d2e..0e9ca156a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ v0.24 ### Changes or improvements +* Custom merge drivers can now be registered, which allows callers to + configure callbacks to honor `merge=driver` configuration in + `.gitattributes`. + * Custom filters can now be registered with wildcard attributes, for example `filter=*`. Consumers should examine the attributes parameter of the `check` function for details. @@ -83,6 +87,10 @@ 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 |