From: Adam Roben <aroben@apple.com>
Date: Mon, 20 Aug 2007 17:11:11 GMT
Subject: Re: Splitting up a changeset
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:

> 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