3 ms·

does 'upstream' mean push to the branch that this is tracking from? edit: yes. http://stackoverflow.com/questions/10002239/difference-between-git-checkout-trac

by canadev 13y ago

does 'upstream' mean push to the branch that this is tracking from? edit: yes. http://stackoverflow.com/questions/10002239/difference-between-git-checkout-track-origin-branch-and-git-checkout-b-branch http://stackoverflow.com/questions/10002239/difference-betwe... "Tracking means that a local branch has its upstream set to a remote branch." edit two: second question. does 'simple' mean the same as 'upstream' as long as the upstream branch (the one you are tracking from) has the same name as your local branch? I believe so but thought I'd double check. I have been using git for 4 years. I like it a lot more than svn. I never rebase. I still don't understand some of the things, like why they call it upstream, 'the branch you are pulling from', and tracking, when to me they all seem to mean the same thing.

DigitalJack 13y ago
It's not a common use case in the github era, but you can pull from other repositories than the one you initially cloned.
- mikepurvis 13y ago
  Still pretty common if you contribute to repos which you don't have commit privileges to. Workflow is: 1. Clone library's master branch, begin using software. 2. Discover problem and commit a fix. 3. Use the Github webui to create a fork of the original repo. 4. git remote rename origin upstream 5. git remote add origin https://github.com/me/awesome-library 6. git push origin master:my-bug-fix 7. Use Github webui to create a pull request from your my-bug-fix branch into the upstream master. Having both remotes is necessary, though, when the thing you forked is being actively developed. If there's a review period of a few days, you may need to rebase from the upstream—you want to be doing this from the command line, not bumbling around in the Github webui trying to manage it there.
- TazeTSchnitzel 13y ago
  On the contrary, it's quite common to need to pull down others' branches from GitHub.

by canadev 13y ago

DigitalJack 13y ago

It's not a common use case in the github era, but you can pull from other repositories than the one you initially cloned.

mikepurvis 13y ago
Still pretty common if you contribute to repos which you don't have commit privileges to. Workflow is: 1. Clone library's master branch, begin using software. 2. Discover problem and commit a fix. 3. Use the Github webui to create a fork of the original repo. 4. git remote rename origin upstream 5. git remote add origin https://github.com/me/awesome-library 6. git push origin master:my-bug-fix 7. Use Github webui to create a pull request from your my-bug-fix branch into the upstream master. Having both remotes is necessary, though, when the thing you forked is being actively developed. If there's a review period of a few days, you may need to rebase from the upstream—you want to be doing this from the command line, not bumbling around in the Github webui trying to manage it there.
TazeTSchnitzel 13y ago
On the contrary, it's quite common to need to pull down others' branches from GitHub.