Re: switching upstream tips

From: Alex Riesen <raa.lkml@gmail.com>
Date: May 13, 2009, 09:05 UTC
Message-ID: <81b0412b0905130205u68237834o9172685974cbac4f@mail.gmail.com>
In-Reply-To: <4A0A858C.2070808@gmail.com>

2009/5/13 Ittay Dror <ittay.dror@gmail.com>:

Show 15 quoted lines

> Alex Riesen wrote:
>> 2009/5/13 Ittay Dror <ittay.dror@gmail.com>:
>>>
>>> tried git rebase, this is what i get:
>>> git rebase -i upstream master
>>> fatal: Needed a single revision
>>> Invalid base
>>>
>>
>> $ git checkout my-old-master-based-on-old-upstream
>> $ git rebase -i old-upstream
>>
>
> so i need to create an 'old-upstream' branch first, that is based on the tip
> of the old-upstream remote, right? how?

no. Just use the remote reference. Should be something like origin/master. It is the reference to the commit where to put your commits on. You can use the SHA1 there, if you wish. All the rebasing happens on and to that branch of yours (my-old-master-based-on-old-upstream in the example above)

> (thanks for the patience)

This patience is just about to end. Ever looked at the man pages? "git help git" can be a good start.