Re: [gentoo-catalyst] master rebase of catalyst 2

[William Hubbs <williamh@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 1177 bytes --]

All, it is safe to forget about the branch I was talking about with over
100 commits on it. Git has some tools which can help us figure out which
commits need to go to master from catalyst_2.

First, make sure your repository is up to date.

Once that is done, one thing you can do is look at the commits on
catalyst_2 by exporting them to patches.

To do this, check out the catalyst_2 branch and run this command:

git format-patch master

That will turn all of the commits on catalyst_2 into patches and save
them in your current directory.

It is also possible to let git tell you which commits it thinks are
already on master by running this command while you are on the catalyst_2 branch.

git cherry master

This produces a list of commit hashes preceeded by '+' or '-'. In this
example, the commits that start with '+' are the ones git thinks are
NOT in the master branch.

At that point it will be a matter of looking at each commit manually,
deciding if it needs to be ported to master and making the appropriate
change on master as well.

Do you have any thoughts about how we can go about forward porting these
changes from catalyst_2 to master?

Thanks,

William


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]