From: Ittay Dror Date: Wed, 13 May 2009 08:07:22 GMT Subject: Re: switching upstream tips Message-ID: <4A0A7FBA.1010606@gmail.com> In-Reply-To: <4A0A7D5E.1010909@viscovery.net> Johannes Sixt wrote: > Ittay Dror schrieb: > >> Alex Riesen wrote: >> >>> 2009/5/13 Ittay Dror : >>> >>>>> 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. > same thing: > git rebase -i --onto upstream old-upstream master fatal: Needed a single revision Does not point to a valid commit: upstream > -- Hannes > >