git命令

查看分支-git branch

-B85M-D2V:~/workspace/quark$ git branch

master

taskbranch/1

taskbranch/5

taskbranch/6

* taskbranch/7

taskbranch/lang

创建本地分支- git branch taskbranch/8

arkgitbranchtaskbranch/8rk git branch taskbranch/8
rk git branch

master

taskbranch/1

taskbranch/5

taskbranch/6

* taskbranch/7

taskbranch/8

taskbranch/lang

创建运程分支- git push origin taskbranch/8

ark$ git push origin taskbranch/8

Total 0 (delta 0), reused 0 (delta 0)

[new branch] taskbranch/8 -> taskbranch/8

## 查看分支-git branch ##

ark$ git branch

master

taskbranch/1

taskbranch/5

taskbranch/6

taskbranch/7

taskbranch/8

taskbranch/lang

查看所有分支-git branch -a

ark$ git branch -a

master

taskbranch/1

taskbranch/5

taskbranch/6

* taskbranch/7

taskbranch/8

taskbranch/lang

remotes/origin/HEAD -> origin/master

remotes/origin/master

remotes/origin/qingchengl/taskbranch/5

remotes/origin/server_branch

remotes/origin/taskbranch/1

remotes/origin/taskbranch/2

remotes/origin/taskbranch/3

remotes/origin/taskbranch/4

remotes/origin/taskbranch/5

remotes/origin/taskbranch/6

remotes/origin/taskbranch/7

remotes/origin/taskbranch/8

remotes/origin/taskbranch/lang

切换分支- git checkout taskbranch/8

arkgitcheckouttaskbranch/8/src/main/res/values/strings.xml切换到分支‘taskbranch/8′ark git checkout taskbranch/8
/src/main/res/values/strings.xml
切换到分支 ‘taskbranch/8’
ark git branch

1 查看远程分支

$ git branch -a

* br-2.1.2.2

master

remotes/origin/HEAD -> origin/master

remotes/origin/br-2.1.2.1

remotes/origin/br-2.1.2.2

remotes/origin/br-2.1.3

remotes/origin/master

2 查看本地分支

$ git branch

* br-2.1.2.2

master

3 创建分支

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)

$ git branch test

$ git branch

* br-2.1.2.2

master

test

4 切换分支到test

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)

$ git branch

* br-2.1.2.2

master

test

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)

$ git checkout test

M jingwei-server/src/main/java/com/taobao/jingwei/server/service/cmd/GetCustomerTarCmd.java

M jingwei-server/src/main/java/com/taobao/jingwei/server/util/ServerUtil.java

Switched to branch 'test'

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (test)

$ git branch

br-2.1.2.2

master

* test

5 删除本地分支 git branch -d xxxxx

$ git checkout br-2.1.2.2

M jingwei-server/src/main/java/com/taobao/jingwei/server/service/cmd/GetCustomerTarCmd.java

M jingwei-server/src/main/java/com/taobao/jingwei/server/util/ServerUtil.java

Switched to branch 'br-2.1.2.2'

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)

$ git br

* br-2.1.2.2

master

test

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)

$ git br -d test

Deleted branch test (was 17d28d9).

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (br-2.1.2.2)

$ git br

* br-2.1.2.2

6 查看本地和远程分支 -a。前面带*号的代表你当前工作目录所处的分支

shuohailhl@SHUOHAILHL-PC /f/ggg/jingwei (test)

$ git branch -a

br-2.1.2.2

master

* test

remotes/origin/HEAD -> origin/master

remotes/origin/br-2.1.2.1

remotes/origin/br-2.1.2.2

remotes/origin/br-2.1.3

remotes/origin/master

7、git Please move or remove them before you can merge. 错误解决方案

git clean  -d  -fx ""
其中
x  -----删除忽略文件已经对git来说不识别的文件
d  -----删除未被添加到git的路径中的文件
f  -----强制运行

8、相关命令

===============命令================

==gitstatus查看当前本地库的状态==git status 查看当前本地库的状态
==git add . 将所有新的文件添加到版本管理中

==gitaddH.txt将H.txt添加到版本管理中==git add H.txt 将H.txt添加到版本管理中
==git commit -m “hello git” 我把修改的文件添加到本地仓库中并且给这次提交设置一个名字”hello git”

==gitpush把刚才本地库更新的代码推送到云端==git push 把刚才本地库更新的代码推送到云端
==git pull 把云端库更新的代码拉取到本地库

==gitconfig–globaluser.email“youremail@whatever.com”设置自己的email就是自己的github的email==git config –global user.email “your_email@whatever.com” 设置自己的email就是自己的github的email
==git config –global user.name “username” 设置自己的username就是自己的github用户名

=============补充命令==============

==cdh:进入到H盘符下==cd h: 进入到H盘符下
==cd test/ 进入到test/文件夹下

==cd..退回到上一级目录==cd .. 退回到上一级目录
==mkdir test 在当前目录创建一个test文件夹

============git教程================

在自己的github新建一个仓库练习

地址：http://igit.linuxtoy.org/contents.html（学习git电子书） **点击中间的contents返回到目录

部分参考文章出自：/article/1218434.html