Re: TOI patch generation...

Nix <[email protected]> Wed, 18 Jul 2012 15:58:00 +0100
Newsgroups gmane.linux.swsusp.devel
Message-ID <[email protected]>
On 18 Jul 2012, Woody Suwalski told this:

> Thanks, "git diff v3.5-rc5..HEAD" seems to work OK for 3.5-rc5
>
> As expected - there is a drawback: it is now very 3.5-rc5 specific,
> and covers more than just TOI changes - I think it includes kernel
> later changes as well.

If you have vanilla and tuxonice branches,

git diff $(git merge-base vanilla tuxonice)..tuxonice

should always give you a diff of just stuff introduced on the tuxonice
branch.

> I already have git trees of linus-head, a tree of toi-head. How to tie them together?
> Any hints? 8-)

"git remote add" is the thing to look for. You can have as many remote
repositories associated with a local repository as you like (they don't
even have to have anything in common, though this is considered somewhat
strange: normally the remote repositories you add to a given local
repository are somehow related to each other, so they can share objects
and they have a meaningful merge base and stuff like that).

-- 
NULL && (void)