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

Re: How to install and use a custom merge driver

From
Jeff King <peff@peff.net>
Date
Jan 28, 2009, 06:18 UTC
Message-ID
<20090128061848.GA19165@coredump.intra.peff.net>
In-Reply-To
<497FCC9A.9080008@gmail.com>
On Wed, Jan 28, 2009 at 02:10:18PM +1100, Alec Clews wrote:
Show 5 quoted lines
> Setup:
>
> I have set up my ..git/info/gitattributes as follows
>
> *      merge=overwrite

Your setup looks right, except that the correct file is ".git/info/attributes".

-Peff
Previous: Alec ClewsNext: Alec Clews
Message 2 of 9 in “How to install and use a custom merge driver”
  1. Alec ClewsJan 28, 2009
  2. Jeff KingJan 28, 2009
  3. Alec ClewsJan 28, 2009
  4. Alec ClewsJan 28, 2009
  5. Jeff KingJan 29, 2009
  6. Alec ClewsJan 29, 2009
  7. Jeff KingJan 29, 2009
  8. Alec ClewsJan 29, 2009
  9. Jeff KingJan 29, 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.