简易的命令行入门教程<开源中国>

来源:互联网 发布:caffe bene 菜单 编辑:程序博客网 时间:2024/04/29 08:34

Git 全局设置:

git config --global user.name "makgw"git config --global user.email "makangguowei@163.com"

创建 git 仓库:

mkdir BhAlertcd BhAlertgit inittouch README.mdgit add README.mdgit commit -m "first commit"git remote add origin https://git.oschina.net/makgw/BhAler11t.gitgit push -u origin master

已有项目?

cd existing_git_repogit remote add origin https://git.oschina.net/makgw/BhAler11t.gitgit push -u origin master

从远程库down项目

$ git pull https://git.oschina.net/masterkgw/bhAler11t.git master

其中https://git.oschina.net/masterkgw/bhAler11t.git为git库 master为分支

强行down下来

 git pull origin master     --allow-unrelated-histories

其中master为分支名

常见问题:

Git新建本地分支与远程分支关联问题:git branch --set-upstreamgit在本地新建分支, push到remote服务器上之后,再次pull下来的时候,如果不做处理会报以下提示: You asked me to pull without telling me which branch youwant to merge with, and 'branch.production.merge' inyour configuration file does not tell me, either. Pleasespecify which branch you want to use on the command line andtry again (e.g. 'git pull <repository> <refspec>').See git-pull(1) for details.If you often merge with the same branch, you may want touse 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.

问题解析:
git本地新建一个分支后,必须要做远程分支关联。如果没有关联, git 会在下面的操作中提示你显示的添加关联。关联目的是如果在本地分支下操作: git pull, git push ,不需要指定在命令行指定远程的分支. 推送到远程分支后, 你只要没有显示指定, git pull 的时候,就会提示你。

解决方法:

使用命令git branch –set-upstream ;实例如下,其中debug为创建的分支

git branch –set-upstream debug origin/debug
命令的最终修改都是针对 config 文件。

使用-- set-upstream 去跟踪远程分支。

0 0
原创粉丝点击