Re: The merge from hell...

From: Marco Costalba <mcostalba@gmail.com>
Date: Feb 2, 2006, 07:25 UTC
Message-ID: <e5bfff550602012325s7d0a799ct5bfabbce2c579449@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0602012212200.21884@g5.osdl.org>

On 2/2/06, Linus Torvalds <torvalds@osdl.org> wrote:

> Btw, I think you're better off parsing the "git-diff-tree --cc" output
> than doing it yourself like gitk does, now that core git has support for
> things like that.
>

Currently the public git repo version of qgit uses "git-diff-tree -c" for merges, It's not a problem to change qgit to use --cc option instead. But I would like to use just one kind of option to filter merges files.

So I would like to hear some feedback on using --cc vs -c.

Marco

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