diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-03-18 13:17:04 -0400 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-03-18 13:17:04 -0400 |
commit | 89ba9f1acc7d6f26ce45a6ccd128a2c270a5fe79 (patch) | |
tree | 523e5c8b37fc1acf9fb9779a8a29140ea64f2787 /CHANGELOG.md | |
parent | 7568bdf4abf8c99c4bf0a87ff4ce6967c333e70a (diff) | |
parent | 70b0f128c8f8a9f6bd2ec4ec0b326f8c03f9efb4 (diff) | |
download | libgit2-89ba9f1acc7d6f26ce45a6ccd128a2c270a5fe79.tar.gz |
Merge pull request #2967 from jacquesg/merge-whitespace
Allow merges of files (and trees) with whitespace problems/fixes
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 34553aa21..4c095829b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ v0.22 + 1 ### Changes or improvements +* Patience and minimal diff drivers can now be used for merges. + +* Merges can now ignore whitespace changes. + * Updated binary identification in CRLF filtering to avoid false positives in UTF-8 files. @@ -26,6 +30,8 @@ v0.22 + 1 ### API additions +* The `git_merge_options` gained a `file_flags` member. + * Parsing and retrieving a configuration value as a path is exposed via `git_config_parse_path()` and `git_config_get_path()` respectively. @@ -55,6 +61,12 @@ v0.22 + 1 ### Breaking API changes +* The `git_merge_options` structure member `flags` has been renamed + to `tree_flags`. + +* The `git_merge_file_options` structure member `tree_flags` is now + an unsigned int. It was previously a `git_merge_file_flags_t`. + * `GIT_CHECKOUT_SAFE_CREATE` has been removed. Most users will generally be able to switch to `GIT_CHECKOUT_SAFE`, but if you require missing file handling during checkout, you may now use `GIT_CHECKOUT_SAFE | |