On 10/14/2016 10:01 AM, racoon wrote: > On 14.10.2016 15:50, Scott Kostyshak wrote: >> On Fri, Oct 14, 2016 at 02:10:18PM +0200, racoon wrote: >>> Thanks. Unfortunately, the final step "git pull" gives me this: >>> >>> There is no tracking information for the current branch. >>> Please specify which branch you want to merge with. >>> See git-pull(1) for details. >>> >>> git pull <remote> <branch> >>> >>> If you wish to set tracking information for this branch you can do >>> so with: >>> >>> git branch --set-upstream-to=origin/<branch> master >> >> Try the following command: >> >> git branch --set-upstream-to=origin/master master >> >> The command says that your local master branch should be linked to the >> remote's master branch. That way when you do a git pull it will update. > > Thanks. That worked.
I recommend pulling with git pull --rebase This will avoid stupid merge commits by rebasing your current work on top of whatever is getting pulled in from upstream. Richard