Git新建本地分支与远程分支关联问题:git branch --set-upstreamandroid
git在本地新建分支, push到remote服务器上以后,再次pull下来的时候,若是不作处理会报如下提示: git
You asked me to pull without telling me which branch you want to merge with, and 'branch.production.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 "debug"] remote = <nickname> merge = <remote-ref> [remote "<nickname>"] url = <url> fetch = <refspec> See git-config(1) for details.
问题解析:bash
git本地新建一个分支后,必需要作远程分支关联。若是没有关联, git 会在下面的操做中提示你显示的添加关联。关联目的是若是在本地分支下操做: git pull, git push ,不须要指定在命令行指定远程的分支. 推送到远程分支后, 你只要没有显示指定, git pull 的时候,就会提示你。服务器
解决方法:fetch
使用命令git branch --set-upstream ;实例以下,其中debug为建立的分支url
git branch --set-upstream debug origin/debug
命令的最终修改都是针对 config 文件。spa
使用-- set-upstream 去跟踪远程分支。 命令行
[core] repositoryformatversion = 0 filemode = true bare = true logallrefupdates = true [remote "origin"] fetch = +refs/heads/*:refs/remotes/origin/* url = git@192.168.1.160:android2.3.5_r1.git [branch "master"] remote = origin merge = refs/heads/master [branch "debug"] remote = origin merge = refs/heads/debug [receive] denyCurrentBranch = ignore
注意仓库.git目录下的config文件debug