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

how to apply patch in the middle

From
BLbill lam <cbill.lam@gmail.com>
Date
Jan 15, 2009, 01:35 UTC
Message-ID
<20090115013535.GB6937@b2j>
I want to change history to rewrite
  - A - B - C - D - E - ..
 
as
 - A - C' - D - E - ..

because rebase/squash cannot automatically resolve conflicts, I generate a patch file from A to C

  git diff A C >pat

However I don't know how apply this patch and cancel the old B and C. Sorry for this newbie question.

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
唐詩008 杜甫  望嶽
    岱宗夫如何  齊魯青未了  造化鍾神秀  陰陽割昏曉
    盪胸生層雲  決眥入歸鳥  會當凌絕頂  一覽眾山小
Next: Shawn O. Pearce
Message 1 of 2 in “how to apply patch in the middle”
  1. bill lamJan 15, 2009
  2. Shawn O. PearceJan 15, 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.