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

Re: What's in git.git

From
Junio C Hamano <junkio@cox.net>
Date
Mar 5, 2006, 10:10 UTC
Message-ID
<7vy7zpgq1i.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<46a038f90603050121u6bccbb71ve78de69ae45b96ad@mail.gmail.com>
"Martin Langhoff" <martin.langhoff@gmail.com> writes:
> I'm somewhat confused by the fact that there are two emacs modes, both
> by Alexandre. Which one should I use? Also -- the killer app for
> emacs+git would be to leverage the great patch-editing mode in emacs.

They are different styles. I've been in VC camp but my understanding is pcl-cvs style integration is closer to whole-tree than VC which is more per-file. I still haven't adjusted to pcl-cvs style yet..

> (of course, if xxdiff and others can help, that'd be cool too, but
> currently they seem strangely unable to deal with files with diff3
> conflict markers.)
I had pleasant experiences with "xxdiff -U".
Previous: Alexandre Julliard
Message 14 of 14 in “What's in git.git”
  1. Junio C HamanoMar 5, 2006
  2. Junio C HamanoMar 5, 2006
  3. Linus TorvaldsMar 5, 2006
  4. Junio C HamanoMar 5, 2006
  5. Linus TorvaldsMar 5, 2006
  6. Linus TorvaldsMar 5, 2006
  7. Junio C HamanoMar 5, 2006
  8. Linus TorvaldsMar 5, 2006
  9. Junio C HamanoMar 5, 2006
  10. Martin LanghoffMar 5, 2006
  11. Alexandre JulliardMar 5, 2006
  12. Martin LanghoffMar 5, 2006
  13. Alexandre JulliardMar 5, 2006
  14. Junio C HamanoMar 5, 2006

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.