diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-01-29 13:14:00 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-01-29 13:15:55 -0800 |
| commit | 0972c59205a0cf29e75b45695cde5dc699983bc0 (patch) | |
| tree | 78a48f50068edc95df150f8fe29fa19e20b9633b /include/git2/commit.h | |
| parent | b747eb1445fa54675044b6d05e892904b517239c (diff) | |
| download | libgit2-0972c59205a0cf29e75b45695cde5dc699983bc0.tar.gz | |
Two-phase index merging
When three-way merging indexes, we previously changed each path
as we read them, which would lead to us adding an index entry for
'foo', then removing an index entry for 'foo/file'. With the new
index requirements, this is not allowed. Removing entries in the
merged index, then adding them, resolves this. In the previous
example, we now remove 'foo/file' before adding 'foo'.
Diffstat (limited to 'include/git2/commit.h')
0 files changed, 0 insertions, 0 deletions