diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-05-23 14:50:51 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-07-01 17:32:15 -0400 |
| commit | 967f5a76b1c89f1f93840407fd2afd1e8005dad6 (patch) | |
| tree | 6f8c392d63aa0d7dc6e9a254cb37fdbecb7b9937 /src/merge.h | |
| parent | 1453bd20897d074a3f65d86f0d2bbb72ed23d071 (diff) | |
| download | libgit2-967f5a76b1c89f1f93840407fd2afd1e8005dad6.tar.gz | |
git_checkout_index: checkout other indexes
git_checkout_index can now check out other git_index's (that are not
necessarily the repository index). This allows checkout_index to use
the repository's index for stat cache information instead of the index
data being checked out. git_merge and friends now check out their
indexes directly instead of trying to blend it into the running index.
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index 00f6197bf..cc17389ab 100644 --- a/src/merge.h +++ b/src/merge.h @@ -149,7 +149,7 @@ int git_merge__setup( const git_merge_head *heads[], size_t heads_len); -int git_merge__indexes(git_repository *repo, git_index *index_new); +int git_merge__check_result(git_repository *repo, git_index *index_new); int git_merge__append_conflicts_to_merge_msg(git_repository *repo, git_index *index); |