From: Jan Hudec <bulb@ucw.cz>
To: Alan <alan@clueserver.org>
Cc: git@vger.kernel.org
Subject: Re: Rebase v.s. fast forward
Date: Sun, 22 Feb 2009 20:00:36 +0100 [thread overview]
Message-ID: <20090222190036.GB6504@efreet.light.src> (raw)
In-Reply-To: <1234914604.3334.7.camel@rottwang.fnordora.org>
On Tue, Feb 17, 2009 at 15:50:04 -0800, Alan wrote:
> I am dealing with a kernel branch of a branch that undergoes frequent
> rebases and I want to know the easiest way of handling things.
>
> The tree is pulled from kernel.org. Patches are applied to the tree by a
> developer here on a branch. I take that branch, make my own branch, add
> drivers and other modifications and publish to a different repo.
>
> Now that 2.6.29 is occurring, every time there is a new RC candidate, he
> rebases the tree and tells everyone to rebuild. Since the developers on
> my projects have their own branches off of my tree, rebuilding
> everything is starting to look like a big pain.
>
> Is there a way to take a rebased repository and apply the changes in a
> manner that does not require reconstructing everything from patches?
No, there is not. When you have some changes on top of rebased branch, you
have to rebase them.
> Can you fast forward on a rebased repo or are you just hosed? (Or would
> that be considered "frebasing"?)
Well, fast-forward condition is when you pull and you have no local changes.
Which I guess is not your case.
I am not sure whether pull properly detects the case, where the pulled branch
got rebased (so strictly-speaking it's not a fast-forward), but there are no
local changes, but since you probably do have some local changes, it would
not help you.
--
Jan 'Bulb' Hudec <bulb@ucw.cz>
prev parent reply other threads:[~2009-02-22 19:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-17 23:50 Rebase v.s. fast forward Alan
2009-02-22 19:00 ` Jan Hudec [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=20090222190036.GB6504@efreet.light.src \
--to=bulb@ucw.cz \
--cc=alan@clueserver.org \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.