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

Re: A better approach to diffing and merging

From
Karl Hasselström <kha@treskal.com>
Date
Dec 2, 2008, 08:37 UTC
Message-ID
<20081202083726.GA17563@diana.vm.bytemark.co.uk>
In-Reply-To
<m3y6z0i0mu.fsf@localhost.localdomain>
On 2008-12-01 03:41:38 -0800, Jakub Narebski wrote:
> Third, it would require embedding knowledge about various programming
> languages (including C, shell, Perl, TeX) and document formats
> (including XML, HTML, AsciiDoc) in version control system...

Really? I was under the impression that you could specify external diff and merge programs in .gitattributes, which would be precisely the right way to hook this stuff into git.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Jakub Narebski
Message 7 of 7 in “A better approach to diffing and merging”
  1. Ian ClarkeNov 29, 2008
  2. Boyd Stephen Smith Jr.Nov 29, 2008
  3. Miklos VajnaNov 30, 2008
  4. Brian DessentNov 30, 2008
  5. Karl HasselströmDec 1, 2008
  6. Jakub NarebskiDec 1, 2008
  7. Karl HasselströmDec 2, 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.