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

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

From
Junio C Hamano <junkio@cox.net>
Date
Aug 30, 2005, 01:34 UTC
Message-ID
<7vbr3g5hsb.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.58.0508291821010.3243@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
Show 11 quoted lines
> On Mon, 29 Aug 2005, Junio C Hamano wrote:
>> 
>> I, however, am not 100% convinced --ignore-applied is too
>> dangerous to be useful in any conceivable use cases, at least
>> not yet.  For example, you might be cherry-picking a change from
>> a foreign branch with 'git-diff-tree -p other~45 | git apply',
>> where the current branch may have already aquired part of the
>> changes that foreign branch contains since 45 generations ago.
>
> .. and that's why we use a three-way merge, and not diffs, to merge two 
> branches.

.. and that's why I recently rewrote revert, cherry-pick and rebase to use three-way merge as well ;-).

The code is simple enough and I see some beauty in it, but I honor your veto, at least for now.

Previous: Linus TorvaldsNext: Linus Torvalds
Message 9 of 11 in “Fix git patch header processing in git-apply.”
  1. 1/9 Fix git patch header processing in git-apply.Robert Fitzsimons, Aug 28, 2005
  2. 2/9 Fix detection of files with only one line in git-apply.Robert Fitzsimons, Aug 28, 2005
  3. Linus TorvaldsAug 28, 2005
  4. Junio C HamanoAug 28, 2005
  5. Robert FitzsimonsAug 29, 2005
  6. Linus TorvaldsAug 30, 2005
  7. Junio C HamanoAug 30, 2005
  8. Linus TorvaldsAug 30, 2005
  9. Junio C HamanoAug 30, 2005
  10. Linus TorvaldsAug 30, 2005
  11. Martin LanghoffAug 30, 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.