git 执行git push 和git pull的操做时候,常常看到下面的提示:
You asked me to pull without telling me which branch you
want to merge with, and 'branch.dev.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 <repository> <refspec>').
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 "dev"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
在高版本的 git下面,也许会看见这样的提示:
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 master origin/<branch>
看到第二个提示,咱们如今知道了一种解决方案。也就是指定当前工做目录工做分支,跟远程的仓库,分支之间的连接关系。
好比咱们设置master对应远程仓库的master分支
git branch --set-upstream master origin/master
这样在咱们每次想push或者pull的时候,只须要 输入git push 或者git pull便可。
在此以前,咱们必需要指定想要push或者pull的远程分支。
git push origin master
git pull origin master.git