Re: Git setup for kernel in-house development + mainstream submissions?

[Matt Graham <mdg149@gmail.com>]

On Sun, Feb 1, 2009 at 16:25, PaV <pav@aster.pl> wrote:
> I would like to kindly ask for suggestions how to setup and use git in a
> company that performs in-house kernel development (drivers mostly) for
> its own devices and would like to occasionaly submit patches for mainstream.
>
> 4) a simple way to select changes (which may be as small as only parts
> of any of the drivers), format them and submit for upstream merge.
> Preferably, if possible, prepare those series of patches and store them
> for later use (immediate submission might not be possible and might not
> be done at all).
>
> (4) - now this is hard.
> The main problems are how to create, how to diff and how to manage those
> patches (stgit?) and what to do when mainstream gets updated, etc...

When you decide what to prepare for an upstream merge, it sounds like
what you'd want to do is make a new "upstream" branch and cherry pick
the changes you want onto it.  You can use git cherry-pick -n to clean
them up or squash them together if necessary.