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

merge removed content back into current content

From
NKNeal Kreitzinger <neal@rsss.com>
Date
Sep 25, 2010, 03:06 UTC
Message-ID
<i7jp1a$kc0$1@dough.gmane.org>

How do I tell git to merge a single program from an old commit into the current version of that program in the HEAD commit? In this scenario, I want to get back some removed code but still keep the new code.

e.g.
Commit-1 = initial commit containing Program-A, and other programs
Commit-2 = add Changeset-1 to Program-A , and make changes to other programs

Commit-3 = remove Changeset-1 from Program-A, then add Changeset-2 to Program-A, and make changes to other programs

*desired* Commit-4 = only merge Program-A from Commit-2 into Program-A of Commit-3, and don't change any other programs (in other words, get my old changes from Commit-2 back, but don't loose the new changes from Commit-3)

v/r, Neal

Next: Elijah Newren
Message 1 of 5 in “merge removed content back into current content”
  1. Neal KreitzingerSep 25, 2010
  2. Elijah NewrenSep 25, 2010
  3. Eric RaibleSep 27, 2010
  4. Neal KreitzingerSep 28, 2010
  5. Neal KreitzingerSep 28, 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.