The 05/07/10, Junio C Hamano wrote: > > This is quite an old message; I don't think it has much to do with 1.7-ness > of your version. > > The first "uptodate" refers to your tree state being up-to-date. You > already had the necessary changes the other history wanted you to > have---they were acquired in your history before you started this merge by > some other means. Perhaps merging from other trees, or picking up > equivalent patches from mailing list, etc. This is what I was guessing but wanted to be sure that the resulting messages were intended as is. > A merge commit is still created in this case, in order to record the fact > that everything origin/master wanted to do to your history has already > been reconciled to your history. Otherwise "git log ..origin/master" will > still show commits your history does not have. Thanks for the explanations. -- Nicolas Sebrecht -- 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