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

Re: Splitting up a changeset

From
Adam Roben <aroben@apple.com>
Date
Aug 20, 2007, 17:11 UTC
Message-ID
<F75C083B-2E70-4CD0-8F4B-F207E3333D8E@apple.com>
In-Reply-To
<e1bf234c0708200632g3a2282bfr76863555493d513@mail.gmail.com>
On Aug 20, 2007, at 6:32 AM, Frank Showman wrote:
Show 6 quoted lines
> What I really want to do is merge a couple of files from a changeset
> at a time. Given that GIT doesn't track files, the only sensible way
> to do that seems to split up the changeset (I want GIT to track the
> merges) and then merge (cherry pick) the split up stuff.
>
> Is there some (reasonably simple) way to do that?
    One way I've done this in the past is like this:

git cherry-pick -n <rev-to-split-up> git reset HEAD git add <first-batch-of-files> git commit git add <next-batch-of-files> git commit ...

-Adam
Previous: Frank ShowmanNext: Alex Riesen
Message 2 of 4 in “Splitting up a changeset”
  1. Frank ShowmanAug 20, 2007
  2. Adam RobenAug 20, 2007
  3. Alex RiesenAug 20, 2007
  4. Jan HudecAug 20, 2007

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.