Question

I was reading on:
https://wiki.diasporafoundation.org/Git_workflow#Rebase_your_development_branch_on_the_latest_upstream

Here is an extract:

Your Repository Up to Date

In order to get the latest updates from the development trunk do a
one-time setup to establish the main GitHub repo as a remote by
entering:

$ git remote add upstream git://github.com/diaspora/diaspora.git

Rebase Your Development Branch on the Latest Upstream

To keep your development branch up to date, rebase your changes on top
of the current state of the upstream master. See the What’s
git-rebase? section below to learn more about rebasing.

If you’ve set up an upstream branch as detailed above, and a
development branch called 100-retweet-bugfix, you’d update upstream,
update your local master, and rebase your branch from it like so:

$ git fetch upstream

$ git checkout master

$ git rebase upstream/master

$ git checkout 100-retweet-bugfix

[make sure all is committed as necessary in branch]

$ git rebase master

Why is adding a ‘remote upstream’ needed in this case? Coudn’t I have just done:

$ git checkout master

$ git pull origin master

$ git checkout 100-retweet-bugfix

[make sure all is committed as necessary in branch]

$ git rebase master

Answer 1

The wiki is talking from a forked repo point of view. You have access to pull and push from origin, which will be your fork of the main diaspora repo. To pull in changes from this main repo, you add a remote, “upstream” in your local repo, pointing to this original and pull from it.

So “origin” is a clone of your fork repo, from which you push and pull. “Upstream” is a name for the main repo, from where you pull and keep a clone of your fork updated, but you don’t have push access to it.