git pull 出现 There is no tracking information for the current branch

今天在git  pull的时候出现:

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> devMan-branch-noip-QRcode-install

解决方法,编辑.git 里的config文件:

vim .git/config

添加了如下:

[branch "devMan-branch-noip-install"]
        remote = origin
        merge = refs/heads/devMan-branch-noip-install

--- 以下为我添加的内容 ---

[branch "devMan-branch-noip-QRcode-install"]
        remote = origin
        merge = refs/heads/devMan-branch-noip-QRcode-install

再次git pull 成功:

localhost:ci liyuanhong$ vim .git/config 
localhost:ci liyuanhong$ cp .git/config .git/config.bak
localhost:ci liyuanhong$ vim .git/config 
localhost:ci liyuanhong$ git pull
Merge made by the 'recursive' strategy.
 README.md                | 1 +
 static/devMS/js/index.js | 4 ++--
 static/devMS/js/login.js | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
posted @ 2017-01-29 22:56  远洪  阅读(919)  评论(0)    收藏  举报