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

mergetool ignore

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Jan 16, 2009, 20:19 UTC
Message-ID
<81bfc67a0901161219l23877df8xf1707aaf9e83bcb3@mail.gmail.com>

is there any way to tell git to ignore merging certain files? I've got files that have the same name in each directory. but I can't merge them with an editor... it'd be easier to be able to ignore them with git mergetool... and handle them manually.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com
Message 1 of 1 in “mergetool ignore”
  1. Caleb CushingJan 16, 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.