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

Re: messages confusing

From
NSNicolas Sebrecht <nicolas.s.dev@gmx.fr>
Date
Jul 6, 2010, 08:58 UTC
Message-ID
<20100706085844.GB13054@vidovic>
In-Reply-To
<7v630t5dvo.fsf@alter.siamese.dyndns.org>
The 05/07/10, Junio C Hamano wrote:
Show 9 quoted lines
> 
> 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
Previous: Junio C Hamano
Message 16 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.