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

Re: [PATCH] Clarify text filter merge conflict reduction docs

From
Finn Arne Gangstad <finnag@pvv.org>
Date
Jun 28, 2010, 20:31 UTC
Message-ID
<20100628203128.GA10890@pvv.org>
In-Reply-To
<0cd82ad22a6f240ebcde0c2f3a437a805dae5668.1277753114.git.eyvind.bernhardsen@gmail.com>
On Mon, Jun 28, 2010 at 09:32:50PM +0200, Eyvind Bernhardsen wrote:
Show 6 quoted lines
> How does this look?
> 
> This commit should really be squashed into the first one in the series.
> Live and learn, next time I'll add new changes in a new commit and put
> it _last_.  I'll submit a fixed series once we're happy with the
> documentation.
Looks good I think!
- Finn Arne
Previous: Eyvind BernhardsenNext: Junio C Hamano
Message 5 of 14 in “CRLF merge conflict reduction, take 4”
  1. 0/3 CRLF merge conflict reduction, take 4Eyvind Bernhardsen, Jun 27, 2010
  2. 1/3 Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen, Jun 27, 2010
  3. Finn Arne GangstadJun 28, 2010
  4. Clarify text filter merge conflict reduction docsEyvind Bernhardsen, Jun 28, 2010
  5. Finn Arne GangstadJun 28, 2010
  6. Junio C HamanoJun 29, 2010
  7. Eyvind BernhardsenJun 29, 2010
  8. Junio C HamanoJun 30, 2010
  9. Eyvind BernhardsenJun 30, 2010
  10. Junio C HamanoJul 1, 2010
  11. Eyvind BernhardsenJun 30, 2010
  12. Junio C HamanoJun 30, 2010
  13. 2/3 Try normalizing files to avoid delete/modify conflicts when mergingEyvind Bernhardsen, Jun 27, 2010
  14. 3/3 Don't expand CRLFs when normalizing text during mergeEyvind Bernhardsen, Jun 27, 2010

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.