git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: messages confusing

From
Wincent Colaiuta <win@wincent.com>
Date
Jul 6, 2010, 05:53 UTC
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ó:
Show 12 quoted lines
> 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
Previous: Nicolas SebrechtNext: Nicolas Sebrecht
Message 2 of 16 in “messages confusing”
  1. Nicolas SebrechtJul 6, 2010
  2. Wincent ColaiutaJul 6, 2010
  3. use "up-to-date" in messages instead of "uptodate" for consistencyNicolas Sebrecht, Jul 6, 2010
  4. Ævar Arnfjörð BjarmasonJul 6, 2010
  5. use "up-to-date" instead of "uptodate" for consistencyNicolas Sebrecht, Jul 6, 2010
  6. Junio C HamanoJul 7, 2010
  7. Re: use "up-to-date" instead of "uptodate" for consistencyNicolas Sebrecht, Jul 7, 2010
  8. Junio C HamanoJul 7, 2010
  9. merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistencyNicolas Sebrecht, Jul 7, 2010
  10. Junio C HamanoJul 8, 2010
  11. 1/2 checkout: accord documentation to what git doesNicolas Sebrecht, Jul 9, 2010
  12. Junio C HamanoJul 10, 2010
  13. 2/2 merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistencyNicolas Sebrecht, Jul 9, 2010
  14. Junio C HamanoJul 10, 2010
  15. Junio C HamanoJul 6, 2010
  16. Nicolas SebrechtJul 6, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.