Junio C Hamano <junkio@cox.net> writes: > Petr Baudis <pasky@suse.cz> writes: > >> so this is my attempt to summarize it: > > Ah, our message crossed -- thanks for summarizing it. I do not > particularly like any of the solution so far, but maybe the > patch I just sent out to "do the normal thing unless we are > running tests" might be the right thing to do. I see you caught Merlyn so I decided the patch I sent earlier as a tentative fix and merged the series in "next". We should be able to fix Perly problems in-tree while we have his attention ;-). Rene's merge-bases fix is also in "next". Hopefully this would make merge-recursive work by Alex and Johannes go smoother? On the other front, I applied the --remove-empty --parents fix by Linus to "master". Since this broke gitk and qgit it might warrant a 1.4.1.1 hotfix. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Jul 03 11:38:44 2006
This archive was generated by hypermail 2.1.8 : 2006-07-03 11:40:38 EST