4 ms·

so the distinction here is - origin master <=== the actual remote version of the master branch - origin/master <=== a local branch that you cached from the "o

• weaksauce 5y ago
  origin and master are completely arbitrary too... `git pull remote_repository_name branch_name` is the generic way to look at it instead of some magic incantation. I like to call origin "upstream" to differentiate them. and then git pull is another way to think of git fetch and git merge as one command roughly.
• stormbrew 5y ago
  yep, that's right. Or rather, origin and master are just two parameters given to pull/fetch/push to describe a target while origin/master is just the local name for, as you say, the locally cached ref. Comparing against that locally cached ref is also what git uses to tell you how far behind/ahead of the upstream you are in `git status` or whatever. Fetch and push are the only git commands that actually talk to a remote (at the "user level" of the command set anyways, those are also composed of lower level commands).