From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 11 Mar 2010 10:44:23 GMT
Subject: Re: generate a diff against a specific tag in a remote branch
Message-ID: <81b0412b1003110244s6f682293l79e0815cb6903aad@mail.gmail.com>
In-Reply-To: <74fd948d1003110144l382f7542qed4e80ea0fab6fde@mail.gmail.com>

On Thu, Mar 11, 2010 at 10:44, Pedro Ribeiro <pedrib@gmail.com> wrote:
> I currently have a copy of the kernel TuxOnIce git tree, and the
> latest tag is 2.6.33.
>
> I also have added linus tree as a remote branch
> (git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git).
>
> What I want to do is to make a patch of the TuxOnIce changes to apply
> to the linus' 2.6.33. The problem is that the linus tree keeps
> advacing, obviously, and is now at 2.6.34-rc1.
>
> So what I've been trying to do is to make a diff against the 2.6.33
> tag of linus' tree. Is this possible?

Probably. Try rebasing your TuxOnIce branch on the tag:

  $ git checkout -b temporary TuxOnIce
  $ git rebase v2.6.33

If it works out (you may have to correct some conflicts) during rebase,
the branch "temporary" can be used to generate a set of patches to
add TuxOnIce to a vanill 2.6.33 (by using git format-patch, for example).