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

Re: [PATCH] Fix incorrect wording in git-merge.txt.

From
Matthieu Moy <matthieu.moy@imag.fr>
Date
Mar 3, 2008, 21:25 UTC
Message-ID
<vpqwsojlcu5.fsf@bauges.imag.fr>
In-Reply-To
<alpine.LFD.1.00.0803031519360.2899@xanadu.home>
Nicolas Pitre <nico@cam.org> writes:
Show 6 quoted lines
>> Now, I don't understand the distinction you seem to be making between
>> "commit" and "commit object".
>
> Objects are what the low level storage is made of.  Conceptually, The 
> merge operation doesn't work at the object level, but rather at the 
> history graph level.

I still don't get the distinction. What is the "graph" if not a set of objects pointing to each other?

If you don't want to talk about commit object, then you should fix also user-manual.txt (for example, it states that a merge "create a commit object in the history").

Well, that said, the same sentence as the one I propose without "object" is fine to me, but I just don't understand the difference.

-- 
Matthieu
Previous: Nicolas PitreNext: Nicolas Pitre
Message 7 of 9 in “Fix incorrect wording in git-merge.txt.”
  1. Fix incorrect wording in git-merge.txt.Matthieu Moy, Mar 3, 2008
  2. Junio C HamanoMar 3, 2008
  3. Fix incorrect wording in git-merge.txt.Matthieu Moy, Mar 3, 2008
  4. Nicolas PitreMar 3, 2008
  5. Matthieu MoyMar 3, 2008
  6. Nicolas PitreMar 3, 2008
  7. Matthieu MoyMar 3, 2008
  8. Nicolas PitreMar 3, 2008
  9. Andreas EricssonMar 11, 2008

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.