git命令

1 Command line instructions

You can also upload existing files from your computer using the instructions below.

Git global setup

git config --global user.name "xuanweizi"
git config --global user.email "xuanweizi@orbbec.com"

Create a new repository

git clone gitlab@code.orbbec.com.cn:SLAM/robots/chassis_driver.git
cd chassis_driver
touch README.md
git add README.md
git commit -m "add README"
git push -u origin master

Push an existing folder

cd existing_folder
git init
git remote add origin gitlab@code.orbbec.com.cn:SLAM/robots/chassis_driver.git
git add .
git commit -m "Initial commit"
git push -u origin master

Push an existing Git repository

cd existing_repo
git remote rename origin old-origin
git remote add origin gitlab@code.orbbec.com.cn:SLAM/robots/chassis_driver.git
git push -u origin --all
git push -u origin --tags

2 经验

远程仓库合并

git remote -v
git remote add old_origin gitlab@code.orbbec.com.cn:SLAM/robots/cartographer_ros.git
# git fetch old_origin master
git pull  gitlab@code.orbbec.com.cn:SLAM/robots/cartographer_ros.git
git push -u origin master
git remote remove old_origin 
git remote -v

3 创建新的本地分支并连接到新的远程分支

git remote add guodong_origin gitlab@code.orbbec.com.cn:guodong/rns_framework.git
git checkout -b 13-bug-power-on-proc-lock guodong_origin/13-bug-power-on-proc-lock

4 merge模块仓库到项目仓库(分支)

# 模块仓库下
git remote -v
# 本地仓库增加新的远程（项目仓库）连接
git remote add proj_origin git@github.com:BurryChen/res_g627.git
# 如果不是merge到 main分支，需要建立新的分支；merge mian分支不需要
 git checkout -b plan1_rrt
 # 同步远程分支和本地分支
 # git pull proj_origin plan1_rrt
 # git fetch old_origin master
 #merge 到 远程项目仓库分支
 git push -u proj_origin plan1_rrt
 # 删除远程项目仓库链接
git remote remove proj_origin
git remote -v