From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 06 Jul 2010 06:21:47 GMT
Subject: Re: messages confusing
Message-ID: <7v630t5dvo.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20100706053543.GA13054@vidovic>

Nicolas Sebrecht <nicolas.s.dev@gmx.fr> writes:

> I had those messages today
>
>   % git merge origin/master
>     Already uptodate!
>     Merge made by recursive.
>   %

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.

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.