diff options
| author | Carlos Martín Nieto <carlosmn@github.com> | 2016-02-09 06:26:21 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlosmn@github.com> | 2016-02-09 06:26:21 +0100 |
| commit | 463f53513fd79a0e0bc59ee9a2ed8f4bc948a2e9 (patch) | |
| tree | ba4871e00298717e7884eaa692fbaae69c908495 /include/git2 | |
| parent | 7cdbb39e0a92d08d8c4edd827aeed81ffc74f1a4 (diff) | |
| parent | b00c959f45bfa8e2bb27bec0cfebc4bad5f70df2 (diff) | |
| download | libgit2-463f53513fd79a0e0bc59ee9a2ed8f4bc948a2e9.tar.gz | |
Merge pull request #3601 from ethomson/merge_doc
Better document `git_merge_commits` redux
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 8 |
1 files changed, 0 insertions, 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 |