Re: Merge with git-pasky II.

From: Paul Jackson <pj@engr.sgi.com>
Date: Apr 15, 2005, 15:54 UTC
Message-ID: <20050415085424.5f61b80b.pj@engr.sgi.com>
In-Reply-To: <Pine.LNX.4.58.0504150740310.7211@ppc970.osdl.org>

Linus wrote:

> For example, just doing intra-file diffs is a lot _easier_ and less 
> time-consuming than doing inter-file diffs.

Um ah ... could you explain what you mean by inter and intra file diffs?

Google found a three year old message by Andrew Morton, discussing inter and intra file fragmentation on ext2/ext3 file systems and the find_group_dir() routine. I don't think that's what you had in mind ;).

When I run the 'diff' command, it usually between two files, not between two parts of a file. So I'd have thought inter file diffs were easier.

Clearly, I don't git it.

-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@engr.sgi.com> 1.650.933.1373, 1.925.600.0401

$ 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.