Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: misleading remote repo #26045

Closed
thangktran opened this issue Feb 11, 2019 · 6 comments
Closed

doc: misleading remote repo #26045

thangktran opened this issue Feb 11, 2019 · 6 comments
Labels
question Issues that look for answers.

Comments

@thangktran
Copy link
Contributor

thangktran commented Feb 11, 2019

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 ?

@bnoordhuis bnoordhuis added the question Issues that look for answers. label Feb 11, 2019
@bnoordhuis
Copy link
Member

origin is 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
Copy link
Contributor Author

thangktran commented Feb 11, 2019

origin is 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

@bnoordhuis I think the guide is not consistent.
Since in the other Step, upstream is used to mention "upstream" (nodejs/node) and origin is used to mention forked repo.
Or did i misunderstand something?

@mscdex
Copy link
Contributor

mscdex commented Feb 11, 2019

FWIW I always keep origin the same and use something like github_fork to point to my fork of the project so it's always clear.

@Trott
Copy link
Member

Trott commented Feb 11, 2019

Based on step 1 and the other parts of the doc, I think you're right and it should be upstream instead of origin.

@thangktran
Copy link
Contributor Author

I will create a fix if noone objects to it.

thangktran added a commit to thangktran/node that referenced this issue Feb 12, 2019
To keep consistency through-out the guide.

Fixes: nodejs#26045
@mustafafatal
Copy link

"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

targos pushed a commit that referenced this issue Feb 14, 2019
To keep consistency through-out the guide.

Fixes: #26045

PR-URL: #26050
Reviewed-By: Yuta Hiroto <hello@hiroppy.me>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Masashi Hirano <shisama07@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
question Issues that look for answers.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants