From b00c959f45bfa8e2bb27bec0cfebc4bad5f70df2 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 8 Feb 2016 17:55:22 -0800 Subject: [PATCH] Better document `git_merge_commits` redux `git_merge_commits` and `git_merge` now *do* handle recursive base building for criss-cross merges. Remove the documentation that says that they do not. This reverts commit 5e44d9bcb6d5b20922f49b1913723186f8ced8b5. --- include/git2/merge.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/git2/merge.h b/include/git2/merge.h index af53ead22..560797a0c 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -527,10 +527,6 @@ GIT_EXTERN(int) git_merge_trees( * or checked out. If the index is to be converted to a tree, the caller * should resolve any conflicts that arose as part of the merge. * - * The merge performed uses the first common ancestor, unlike the - * `git-merge-recursive` strategy, which may produce an artificial common - * ancestor tree when there are multiple ancestors. - * * The returned index must be freed explicitly with `git_index_free`. * * @param out pointer to store the index result in @@ -553,10 +549,6 @@ GIT_EXTERN(int) git_merge_commits( * to the index. Callers should inspect the repository's index after this * completes, resolve any conflicts and prepare a commit. * - * The merge performed uses the first common ancestor, unlike the - * `git-merge-recursive` strategy, which may produce an artificial common - * ancestor tree when there are multiple ancestors. - * * For compatibility with git, the repository is put into a merging * state. Once the commit is done (or if the uses wishes to abort), * you should clear this state by calling