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

Re: [PATCH] Fall back to three-way merge when applying a patch.

From
Linus Torvalds <torvalds@osdl.org>
Date
Oct 5, 2005, 04:56 UTC
Message-ID
<Pine.LNX.4.64.0510042155090.31407@g5.osdl.org>
In-Reply-To
<7vd5mk7pv6.fsf@assigned-by-dhcp.cox.net>
On Tue, 4 Oct 2005, Junio C Hamano wrote:
> 
>  * I will be placing this in the proposed updates branch.
>    Hopefully this would alleviate the complaints from people who
>    find the "no fuzz" policy of git-apply is too strict.
This should definitely be enabled by a switch only.

For example, I use git-applypatch _only_ through git-applymbox. Ie non-interactively. I definitely do _not_ want it to try random other trees unless I tell it to, especially when applying a series of 175 patches in one go.

		Linus
Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 17 in “Fall back to three-way merge when applying a patch.”
  1. Fall back to three-way merge when applying a patch.Junio C Hamano, Oct 5, 2005
  2. Linus TorvaldsOct 5, 2005
  3. Junio C HamanoOct 5, 2005
  4. Linus TorvaldsOct 5, 2005
  5. Junio C HamanoOct 6, 2005
  6. Eric W. BiedermanOct 6, 2005
  7. Linus TorvaldsOct 6, 2005
  8. Junio C HamanoOct 6, 2005
  9. Eric W. BiedermanOct 6, 2005
  10. Linus TorvaldsOct 6, 2005
  11. Eric W. BiedermanOct 6, 2005
  12. Linus TorvaldsOct 6, 2005
  13. Eric W. BiedermanOct 6, 2005
  14. Show original and resulting blob object info in diff output.Junio C Hamano, Oct 7, 2005
  15. Linus TorvaldsOct 7, 2005
  16. Junio C HamanoOct 7, 2005
  17. Junio C HamanoOct 6, 2005

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.