On Fri, Sep 18, 2009 at 8:43 AM, Evan Martin <[email protected]> wrote:
> On Fri, Sep 18, 2009 at 8:39 AM, Robert Sesek <[email protected]> wrote:
>> I do this:
>> git fetch origin
>> git rebase origin/trunk <branch I want to rebase>
>> ... the above will download the latest from the central repo and then will
>> rebase your branch onto origin/trunk. This works especially well if you
>> create your branch tracking origin/trunk:
>> git branch mybranch origin/trunk
>
> The problem is that rebase checks out your old branch first, only to
> throw it away, check out the new branch, and reapply the old branch as
> a series of patches.  I don't know why it's written that way; there's
> likely some interesting technical reason but I think the simpler goal
> of "forward-port my stuff to tip of tree" can be done in a faster way.

Are you sure?  I thought that in the case where you gave a branch to
rebase, it reset the branch to <upstream>, then replayed all of the
branch's local commits.  Whereas checkout/rebase will reset to the old
<upstream> with changes, then reset to <upstream>, then replay the
changes.  I could be wrong.

-scott

--~--~---------~--~----~------------~-------~--~----~
Chromium Developers mailing list: [email protected] 
View archives, change email options, or unsubscribe: 
    http://groups.google.com/group/chromium-dev
-~----------~----~----~----~------~----~------~--~---

Reply via email to