Configure git so that "git pull" instead of "git pull origin master"?

Question

Using git pull used to retrieve from remote storage, as expected, now it asks me to use git pull origin master . I do not quite understand the instructions that he gives me, saying that I can add something to my configuration file:

 [branch "master"] remote = <nickname> merge = <remote-ref> [remote "<nickname>"] url = <url> fetch = <refspec> 

Now my configuration file looks like

 [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true ignorecase = true [remote "origin"] url = |redacted| fetch = +refs/heads/*:refs/remotes/origin/* 

So, I guess I need to add

 [branch "master"] remote = origin merge = ?? 

What is a merge as an argument? What is remote-ref (erence?)? I tried looking at http://git-scm.com/docs/git-config , but it seems to be more about the team itself.

Thanks in advance!

Answer 1

to try:

 [branch "master"] remote = origin merge = refs/heads/master 

Answer 2

Simple enough to do

 git config branch.master.remote origin 

Answer 3

Just do:

 git branch --set-upstream master origin/master 

Answer 4

An easy way is to use git checkout -t to configure tracking when creating a local branch.