git操作

1、查看分支 git branch -v

E:\myweb\2022\vue-electron-demo>git branch -v
* develop             12d4c78 调用
  develop1.0.0.220919 12d4c78 调用
  master

Tips: 如果想查看当前仓库的远程分支的 URL，可以通过 git remote -v 查看远程 URL

 2、创建分支 git branch 分支名

E:\myweb\2022\vue-electron-demo>git branch develop
E:\myweb\2022\vue-electron-demo>git branch develop1.0.0.220919

 3、切换分支 git checkout 分支名

E:\myweb\2022\vue-electron-demo>git checkout develop1.0.0.220919
Switched to branch 'develop1.0.0.220919'

4、主分支的代码merge合并到自己的分支上：git merge master

E:\myweb\2022\vue-electron-demo>git merge master
Already up to date.

5、上传分支git push origin 分支名

E:\myweb\2022\vue-electron-demo>git push origin develop1.0.0.220919
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Updating references: 100% (1/1)
To http://192.168.13.240:10101/r/caijizhan3.0.git
 * [new branch]      develop1.0.0.220919 -> develop1.0.0.220919

 6、分支代码合并到master主分支上

        1）切换到主分支：git checkout master

E:\myweb\2022\vue-electron-demo>git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

         2）把分支的代码merge到主分支：git merge 分支名

E:\myweb\2022\vue-electron-demo>git merge develop1.0.0.220919
Updating 4c401d6..12d4c78
Fast-forward
 src/components/Alert/Info.vue     |  7 +++--
 src/components/Alert/Player.vue   | 60 +++++++++++++++++++++++++--------------
 src/components/Manage/Service.vue | 31 +++++++++++++++++---
 3 files changed, 70 insertions(+), 28 deletions(-)

        3）合并到主分支：git push

E:\myweb\2022\vue-electron-demo>git push
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote: Updating references: 100% (1/1)
To http://192.168.13.240:10101/r/caijizhan3.0.git
   4c401d6..12d4c78  master -> master

7、git删除本地分支命令git branch -d 分支名

        git checkout 分支名，切换到该分支后：git branch -d 分支名

E:\myweb\2022\vue-electron-demo>git branch -d develop
Deleted branch develop (was 12d4c78).

8、git删除远端分支命令git push origin --delete 分支名

E:\myweb\2022\vue-electron-demo>git push origin --delete develop
remote: Updating references: 100% (1/1)
To http://192.168.13.240:10101/r/caijizhan3.0.git
 - [deleted]         develop

9、新建本地dev分支，并关联远程dev分支

 1）git checkout -b 分支名 origin/分支名

       git checkout -b相当于把两条命令git branch 分支名、git checkout 分支名合成一条，来实现一条命令新建分支+切换分支

git checkout -b develop1.0.0.220919 origin/develop1.0.0.220919

2) 存在分支，拉取远程分支：git fetch origin 分支名

git fetch origin develop1.0.0.220919

10、将远程指定分支 拉取到 本地指定分支上：git pull origin 远程分支名:本地分支名

git pull origin develop1.0.0.220919:develop1.0.0.220919

11、将远程指定分支 拉取到 本地当前分支上：git pull origin 远程分支名

git pull origin develop1.0.0.220919

12、将主分支拉取到分支上：git merge develop1.0.0.220919

git merge develop1.0.0.220919

13、查看本地仓库的文件

git ls-tree --full-tree -r HEAD

 14、 查看commit 修改了什么文件

git log

Tips: git show 提交编号。这个编号可以通过 git log 查看 commit 后复制前几位即可。