Re: switching upstream tips

Johannes Sixt wrote:

Ittay Dror schrieb:
  

quoted

Alex Riesen wrote:
    

quoted

2009/5/13 Ittay Dror [off-list ref]:
      

quoted

quoted

Alex Riesen wrote:
          

quoted

* 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:
    

quoted

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