From: Alex Riesen <raa.lkml@gmail.com>
To: Pedro Ribeiro <pedrib@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: generate a diff against a specific tag in a remote branch
Date: Thu, 11 Mar 2010 11:44:23 +0100 [thread overview]
Message-ID: <81b0412b1003110244s6f682293l79e0815cb6903aad@mail.gmail.com> (raw)
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).
prev parent reply other threads:[~2010-03-11 10:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 9:44 generate a diff against a specific tag in a remote branch Pedro Ribeiro
2010-03-11 10:44 ` Alex Riesen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81b0412b1003110244s6f682293l79e0815cb6903aad@mail.gmail.com \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=pedrib@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).