All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Ittay Dror <ittay.dror@gmail.com>
Cc: Alex Riesen <raa.lkml@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: switching upstream tips
Date: Wed, 13 May 2009 09:57:18 +0200	[thread overview]
Message-ID: <4A0A7D5E.1010909@viscovery.net> (raw)
In-Reply-To: <4A0A7BA1.4030500@gmail.com>

Ittay Dror schrieb:
> Alex Riesen wrote:
>> 2009/5/13 Ittay Dror <ittay.dror@gmail.com>:
>>>> 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

  reply	other threads:[~2009-05-13  7:57 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-13  6:42 switching upstream tips Ittay Dror
2009-05-13  7:19 ` Alex Riesen
2009-05-13  7:33   ` Ittay Dror
     [not found]   ` <4A0A777E.7080506@gmail.com>
2009-05-13  7:41     ` Alex Riesen
2009-05-13  7:49       ` Ittay Dror
2009-05-13  7:57         ` Johannes Sixt [this message]
2009-05-13  8:07           ` Ittay Dror
2009-05-13  8:16             ` Johannes Sixt
2009-05-13  8:16             ` Alex Riesen
2009-05-13  8:15         ` Alex Riesen
2009-05-13  8:32           ` Ittay Dror
2009-05-13  9:05             ` Alex Riesen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4A0A7D5E.1010909@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=ittay.dror@gmail.com \
    --cc=raa.lkml@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.