Question:
Best to be explained at an example: I am on branch 0.58 of repository and this his how I pull:
|
1 2 |
git pull origin 0.58 |
When I just call “git pull”, I get:
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
ip238:openlierox az$ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.0.58.merge' in your configuration file does not tell me either. Please name which branch you want to merge on the command line and try again (e.g. 'git pull See git-pull(1) for details on the refspec. If you often merge with the same branch, you may want to configure the following variables in your configuration file: branch.0.58.remote = branch.0.58.merge = remote. remote. See git-config(1) for details. |
Seems I probably forgot some option (–track ?) when I checked that branch out. Anyway, I have set this now:
|
1 2 3 |
git config branch.0.58.merge 0.58 git config branch.0.58.remote origin |
And this seems to work. Then, just because of interest, I took a look at some other branch about these setting:
|
1 2 3 4 5 |
ip238:openlierox az$ git config branch.0.57.merge refs/heads/0.57 ip238:openlierox az$ git config branch.0.57.remote origin |
I was wondering now, is there a difference between “0.58” or should I specify “refs/heads/0.58”?
What is the difference exactly?
Answer:
A ref is anything pointing to a commit, for example, branches (heads), tags, and remote branches. You should see heads, remotes, and tags in your .git/refs directory, assuming you have all three types of refs in your repository.
refs/heads/0.58 specifies a branch named 0.58. If you don’t specify what namespace the ref is in, git will look in the default ones. This makes using only 0.58 conceivably ambiguous – you could have both a branch and a tag named 0.58.