Junio C Hamano <gitster@xxxxxxxxx> writes: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Right now I do not have time to dig mailing list archive around >> mid March 2006, and I do not recall the requestor's original >> rationale, but I have a vague recollection that we added this >> "no fast-forward check" specifically in response to a user >> request. > > I do not think of a valid reason not to apply your patch. We > wanted to avoid the trivial-merge codepath, but that is not a > valid reason to record a fast forward situation as a merge of > any kind. Gaah. I take it back. At least, subtree _MUST_ not honor fast-forward blindly. git-gui.git project is merged into git.git with that strategy, but if I pull from Shawn once, and then he has more updates while I do not have anything on my tree, it will be a fast-forward. I should not be setting the git.git tree to that of git-gui.git in such a case. - 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
