From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 13 May 2009 08:15:29 GMT
Subject: Re: switching upstream tips
Message-ID: <81b0412b0905130115v78b5065bjdeb3f349072eed4c@mail.gmail.com>
In-Reply-To: <4A0A7BA1.4030500@gmail.com>

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

>> Ok, that simplifies everything. Just cherry-pick (see "git cherry-pick")
>> your commits on new upstream. You might find it easiest if you cherry-pick
>> them on commits in new upstream which correspond the old-upstream
>> exactly.
>
> can you explain a bit more how to work with git cherry-pick? if i understand
> correctly, i need to write down my commits, switch to the new upstream tip
> ('git checkout upstream master'?) and then call git cherry-pick for each of
> my commits.

$ gitk old-upstream-with-my-changes-on-top &
$ git checkout -b my-new-master-on-top-of-new-upstream  new-upstream
...select a commit in gitk...
$ git cherry-pick <paste-the-selected-commit-here> # hit Enter

repeat until you run out of commits you want to have on top of the new upstream.