Repository navigation
doc: misleading remote repo #26045
Description
From Pull Request (Step 9)
It is also frequently necessary to synchronize your Pull Request with other changes that have landed in master by using git rebase:
$ git fetch --all
$ git rebase origin/master
$ git push --force-with-lease origin my-branch
Why is it git rebase origin/master and not git rebase upstream/master ?
Activity
bnoordhuis commentedon Feb 11, 2019
originis conventionally the name used for the canonical upstream repository. It's not a Node.js idiosyncrasy, if that's what you're wondering.Compare: https://stackoverflow.com/questions/9529497/what-is-origin-in-git
thangktran commentedon Feb 11, 2019
@bnoordhuis I think the guide is not consistent.
Since in the other Step,
upstreamis used to mention "upstream" (nodejs/node) andoriginis used to mention forked repo.Or did i misunderstand something?
mscdex commentedon Feb 11, 2019
FWIW I always keep
originthe same and use something likegithub_forkto point to my fork of the project so it's always clear.Trott commentedon Feb 11, 2019
Based on step 1 and the other parts of the doc, I think you're right and it should be
upstreaminstead oforigin.thangktran commentedon Feb 11, 2019
I will create a fix if noone objects to it.
mustafafatal commentedon Feb 13, 2019
"upstream" generally refers to the original repo that you have forked.
"origin" is your fork; your own repo on GitHub, clone of the original repo of GitHub.
check this out:
https://stackoverflow.com/questions/9257533/what-is-the-difference-between-origin-and-upstream-on-github
doc: renamed remote's name
doc: renamed remote's name