From bf2ba5290aad5d058c8a28ec50703bbb977b5bb4 Mon Sep 17 00:00:00 2001 From: Jameson Miller Date: Thu, 30 Apr 2015 10:57:13 -0400 Subject: Update documentation for API changes --- CHANGELOG.md | 2 ++ include/git2/merge.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c97a18b50..4067e48f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,8 @@ support for HTTPS connections insead of OpenSSL. ### Breaking API changes +* `git_smart_subtransport_cb` now has a `param` parameter. + * The `git_merge_options` structure member `flags` has been renamed to `tree_flags`. diff --git a/include/git2/merge.h b/include/git2/merge.h index d3360a7e0..5fef452b9 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -169,7 +169,7 @@ typedef struct { /** The file to favor in region conflicts. */ git_merge_file_favor_t favor; - /** Merge file flags. */ + /** see `git_merge_file_flags_t` above */ unsigned int flags; } git_merge_file_options; @@ -246,6 +246,7 @@ typedef struct { /** Flags for handling conflicting content. */ git_merge_file_favor_t file_favor; + /** see `git_merge_file_flags_t` above */ unsigned int file_flags; } git_merge_options; -- cgit v1.2.1