> > Yikes, the conflicts with sb/more-repo-in-api is quite irritating. > > I think I'll postpone the later parts of this series and ask this to > > be sent after sb/more-repo-in-api matures a bit mroe. > > There were several conflicts, but it was mostly just tedious textual > fixups. I pushed the result to: > > https://github.com/peff/git.git resolve-oid-more-repo > > But I'm happy to wait and rebase if sb/more-repo-in-api is close to > graduating. The merge looks good to me, though I just looked quickly. The series itself is also a pleasant read. Stefan