I create a new branch in Git: git branch my_branch Push it: git push origin my_branch Now say someone made some changes on the server and I want to pull from origin/my_branch. I do: git pull But I get: You asked me to pull without telling me which branch you want to merge with, and 'branch.my_branch.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull '). See git-pull(1) for details.
If you often merge with the same branch, you may want to use something like the following in your configuration file:
[branch "my_branch"] remote = merge =
[remote ""] url = fetch =
See git-config(1) for details. I learned that I can make it work with: git branch --set-upstream my_branch origin/my_branch