Complex rebasing

[Andrew Haley]

On 08/12/16 18:47, Tom Rodriguez wrote:
> 
>> On Dec 8, 2016, at 10:39 AM, Andrew Haley <aph at redhat.com> wrote:
>>
>> On 08/12/16 18:29, Tom Rodriguez wrote:
>>> git pull —rebase origin master is the usual command I use
>>
>> Ah, OK.  That is very different from what I did.
>>
>> I tried "git rebase" but it rebased my checked-out code from my
>> personal master, not graalvm's real master.
>>
>> My remote origin is
>>
>> https://github.com/theRealAph/graal-core (branch aarch64_graal_misc_fixes)
>>
>> and I want to rebase from
>>
>> https://github.com/graalvm/graal-core (branch master)
> 
> Right, so in my example origin would be replaced with whatever you named the remote for graalvm/graal-core.  
> 
> One problem with git is that there are usually 12 ways to do the same thing which complicates giving instructions to someone on how to solve a problem.  Having multiple remotes makes it more complicated as well.  If you have your own repo you might never use master which can get out of date with upstream.  My personal practice is that origin always refers to the repo I will end up pushing to and my personal repo is named after my GitHub user name.

It's still not working for me.


mercury:graal-core $ git remote add graal-master ssh://git@github.com/graalvm/graal-core
mercury:graal-core $ git remote -v
graal-master	ssh://git@github.com/graalvm/graal-core (fetch)
graal-master	ssh://git@github.com/graalvm/graal-core (push)
graal-origin	ssh://git@github.com/graalvm/graal-core.git (fetch)
graal-origin	ssh://git@github.com/graalvm/graal-core.git (push)
origin	https://github.com/theRealAph/graal-core (fetch)
origin	https://github.com/theRealAph/graal-core (push)
mercury:graal-core $ git pull --rebase origin graal-master
fatal: Couldn't find remote ref graal-master

Any ideas?

Andrew.