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

Re: BUG: mergetool fails on gitignore:d files

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 1, 2009, 02:04 UTC
Message-ID
<7vk53wogku.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20090530215418.GA19241@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> Actually, I think the problem is not in mergetool at all, but with the
> dir.c code underlying "git add". "git add" really should not be
> complaining, because you are not adding a new path at all, but are
> rather adding content to a tracked path.
Correct, and thanks.
Previous: Jeff King
Message 5 of 5 in “BUG: mergetool fails on gitignore:d files”
  1. Erik SandbergMay 30, 2009
  2. Markus HeidelbergMay 30, 2009
  3. Jeff KingMay 30, 2009
  4. Jeff KingJun 1, 2009
  5. Junio C HamanoJun 1, 2009

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.