diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2014-07-18 16:00:21 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-07-27 17:17:22 +0200 |
commit | 7db0e6ee48fd68009a7e78cbcbca125d6ce9008d (patch) | |
tree | c8d053d8dd5eccf98811ab80a2cc6c6be44a57e7 /CHANGELOG.md | |
parent | 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d (diff) | |
download | libgit2-7db0e6ee48fd68009a7e78cbcbca125d6ce9008d.tar.gz |
merge: expose multiple merge basescmn/oidarray
We always calculate multiple merge bases, but up to now we had only
exposed the "best" merge base.
Introduce git_oidarray which analogously to git_strarray lets us return
multiple ids.
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d389b2cb0..dc453f3fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,3 +39,6 @@ v0.21 + 1 * Add support for refspecs with the asterisk in the middle of a pattern. + +* Introduce git_merge_bases() and the git_oidarray type to expose all + merge bases between two commits. |