Re: switching upstream tips

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Ittay Dror schrieb:
> Alex Riesen wrote:
>> 2009/5/13 Ittay Dror <ittay.dror@xxxxxxxxx>:
>>>> Alex Riesen wrote:
>>>>> * Reorder my history so that my commits are on top of the tip of
>>>>> the old
>>>>> upstream repository.
>>>>>         
>>>> Look at "git rebase -i" (interactive rebase)
>>>>       
>>> well, i was hoping for something more automatic. git rebase will list
>>> all
>>> commits without author, so i'll have to manually figure which of them is
>>> mine from the commend and reorder
>>>     
>>
>> git rebase will list only commits not on upstream (simplified).
>> Has nothing to do with author being absent.
>>   
> tried git rebase, this is what i get:
>> git rebase -i upstream master
> fatal: Needed a single revision
> Invalid base

I guess it should have been

   git rebase -i --onto new-upstream old-upstream master

That is, you take commits old-upstream..master and transplant them onto
new-upstream.

-- Hannes

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]