Re:A Git catastrophe cleaned up
by neckro23 on Wednesday December 21, 2016 @10:06AM
(#13229630)
"git pull" is just a shortcut for running "git fetch" and then merging (or rebasing) the current branch to its upstream.
IMO this is a stumbling block for a lot of people new to Git -- for example it covers up the fact that "remote" branches are a separate reference ("master" and "origin/master" are not the same branch!).
Re:A Git catastrophe cleaned up
by strictfp on Wednesday December 21, 2016 @11:58AM
(#13230623)
"remote" branches are called remote-trackimg branches. And yes, it's very confusing. Especially when git status says "up to date with origin/master", but pulls down loads of stuff when you pull...
IMO this is a stumbling block for a lot of people new to Git -- for example it covers up the fact that "remote" branches are a separate reference ("master" and "origin/master" are not the same branch!).