From: Wincent Colaiuta <win@wincent.com>
Date: Tue, 06 Jul 2010 05:53:06 GMT
Subject: Re: messages confusing
Message-ID: <ACE6C748-1F26-473B-BC69-33C59A3969BD@wincent.com>
In-Reply-To: <20100706053543.GA13054@vidovic>

El 06/07/2010, a las 07:35, Nicolas Sebrecht escribió:

> Hi all,
> 
> I had those messages today
> 
>  % git merge origin/master
>    Already uptodate!
>    Merge made by recursive.
>  %
> 
> with git version 1.7.2.rc1.210.g7b476 and I wonder if it is really
> intended.  It did create an empty merge commit but I find both messages
> together a bit confusing here.  Why would Git merge if uptodate?

In any case, "uptodate" should be written as "up-to-date" for consistency with other user-visible messages in Git and in the docs.

Wincent