Re: Best way to generate a git tree containing only a subset of commits from another tree?

From: Radoslaw Szkodzinski <astralstorm@o2.pl>
Date: Mar 22, 2006, 21:28 UTC
Message-ID: <200603222229.02763.astralstorm@o2.pl>
In-Reply-To: <Pine.LNX.4.64.0603221920260.22475@hermes-2.csi.cam.ac.uk>

On Wednesday 22 March 2006 20:28, Anton Altaparmakov wrote yet:

Show 6 quoted lines

> Preferable I would like to do it so that later when Linus has pulled from
> my /usr/src/linux-2.6 tree, I do a "git pull" of Linus' tree from
> /usr/src/my-big-tree and it all works correctly and I don't end up with
> the same commits twice.
>
> Is that possible at all?

Should work out of the box.

Show 5 quoted lines

> If not what can I do to do it cleanly?  Does git help in any way or do I
> literally have to export all my commits from /usr/src/my-big-tree to diff
> style patches and then throw away the tree, clone Linus tree after he has
> pulled my /usr/src/linux-2.6 tree and commit all my generated diff patches
> again?  That would be rather horrible to have to do...

It will work flawlessly if Linus merges your patch without any changes. Else git will merge and maybe conflict if the change was major.

-- 
GPG Key id:  0xD1F10BA2
Fingerprint: 96E2 304A B9C4 949A 10A0  9105 9543 0453 D1F1 0BA2

AstralStorm