查看分支:git branch -a
切换分支:git checkout branchtmp-1.0(创建本地分支)
拉取远程分支代码: git checkout -b branchtmp-1.0 origin/branchtmp-1.0
删除分支: git branch -D branchtmp-1.0
查看本地修改:git status
更细本地代码:git pull --rebase
添加提交目录: git add ./adma/config/
代码提交:git commit -a -m "添加datastorage和megepartition工程"
提交评审:git push origin HEAD:refs/for/branchtmp-1.0%r=***1@***.com.cn,r=***2@***.com.cn
===========2017-12-13=============(遇到“Everything up-to-date”问题,版本逻辑有点乱,当做笔记)
远程分支:master
branch1
branch2
1.clone远程代码:git clone ssh://git@git.helloword.com/octopus/**-realtime.git
2.查看分支:git branch -a;
3.建立本地分支:git checkout -b branch1_local origin/branch1;
4.迭代开发后更新和提交代码到local端:git status(查看提交状态);
git add ./*自定义*;
git commit -a -m "shijiebunengmeiyouwo#add spark streaming project source code."(可能需要用户名和密码);
git status(查看提交状态);
5.local端修改代码传送到本地branch端:git push origin branch1
6.切换到本地branch1分支:git chechout branch1;
7.合并local代码和本地branch1分支:git merge branch1_local
Updating 9f63839..5148515
Fast-forward
pom.xml | 198 +++++++++++++++++++++----------------------------------------------
src/main/scala/com/***/.DS_Store | Bin 0 -> 6148 bytes
src/main/scala/com/***.scala | 50 +++++++++++++++++
src/main/scala/com/***.scala | 13 +++++
4 files changed, 123 insertions(+), 138 deletions(-)
create mode 100644 src/main/scala/com/***
create mode 100644 src/main/scala/com/***.scala
create mode 100644 src/main/scala/com/***.scala
8.本地branch1分支推送到远程:git push -u origin branch1
##可参考链接:http://www.jianshu.com/p/899b9e66a3db
9.当前分支下创建tag
生成tag:git tag -a V1.1.25 -m "new consume version"
推送到远端分支:git push origin V1.1.25