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

Re: Please undo "Use git-merge instead of git-resolve in

From
Junio C Hamano <junkio@cox.net>
Date
Sep 22, 2005, 22:22 UTC
Message-ID
<7vk6h8lp3k.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<BAYC1-PASMTP0510EEC44C7F787F27215AAE970@CEZ.ICE>
"Sean" <seanlkml@sympatico.ca> writes:
> Why doesn't cogito just use the git fetch/pull commands?   Why does it
> need anything special?   It seems like cogito is doing more than just
> being an ease-of-use layer above git.

The way this question is posed is quite unfair to Pasky -- it makes him look needlessly bad.

The simple reason is because Cogito had its own richer fetch/pull first. The development of git aware pack transfer protocols by Linus and the list discussion for multi-head pushes and pulls came much later, which resulted in the current 'git fetch/pull' interface.

Previous: SeanNext: Sean
Message 4 of 11 in “Re: Please undo "Use git-merge instead of git-resolve in”
  1. Jon LoeligerSep 22, 2005
  2. Petr BaudisSep 22, 2005
  3. SeanSep 22, 2005
  4. Junio C HamanoSep 22, 2005
  5. SeanSep 22, 2005
  6. Linus TorvaldsSep 22, 2005
  7. Petr BaudisSep 23, 2005
  8. Junio C HamanoSep 23, 2005
  9. Petr BaudisSep 23, 2005
  10. Daniel BarkalowSep 23, 2005
  11. Junio C HamanoSep 24, 2005

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.