On Fri, May 06, 2011 at 04:22:30PM -0700, Junio C Hamano wrote: > * jk/merge-one-file-working-tree (2011-04-29) 2 commits > (merged to 'next' on 2011-05-02 at 308fe21) > + merge-one-file: fix broken merges with alternate work trees > + add tests for merge-index / merge-one-file Hmm, I expected this to end up on maint. Is it worth cherry-picking (it cleanly applies to maint)? -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html