git/jenkins

版本控制系统

gitlab

代码开发完成> 运维部署上线> 监控性能>

cicd流水线部署，

git和版本控制系统

git

root@server02:~/1103# git log  --oneline
07f230c (HEAD -> main) first commit
root@server02:~/1103# git log -p 07f230c
commit 07f230cd5a4f65e94fef8cc612263463a51363a5 (HEAD -> main)
Author: luohuiwen222 <15115440657@163.com>
Date:   Fri Nov 3 16:27:24 2023 +0800first commitdiff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..72943a1
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+aaa

对比文件变动（暂存区和本地） git diff

root@server02:~/1103# git commit -m  "test3"
[main 0ed45da] test31 file changed, 2 insertions(+)
root@server02:~/1103# git log --oneline
0ed45da (HEAD -> main) test3
45d6e3c commit3
922a0c9 ls
07f230c first commit
root@server02:~/1103# git reset  --soft HEAD~    #回到前一次提交
root@server02:~/1103# git log --oneline
45d6e3c (HEAD -> main) commit3
922a0c9 ls
07f230c first commit

本地仓库

本地远程库指向

远程仓库

root@server02:~/1103# git remote -v
origin git@github.com:luohuiwen222/1103.git (fetch)
origin git@github.com:luohuiwen222/1103.git (push) 推到哪个

root@server02:~/gitee03# git push -u origin “master”

查看标签
root@server02:~/1103# git tag -l
v1.1

删除标签
git tag -d v1.1

推送标签至远程仓库
root@k8s-harbor:~/20231103# git push origin 1.1
Total 0 (delta 0), reused 0 (delta 0)
remote: Powered by GITEE.COM [GNK-6.4]
To gitee.com:luohuiwen/20231103.git

• [new tag] 1.1 -> 1.1

删除远程仓库上的标签
◆git push --delete origin

commit c1e2e5f4414613f572ba1824a76d250c862eff0e
tree 04336b4d6ae3c8d591d8703f979177e96594b2de
parent 50d8a68c810b6d90b691e3d5fa0ce5711f3f2520
author root <root@k8s-harbor.luohw.net> 1699012062 +0800
committer root <root@k8s-harbor.luohw.net> 1699012062 +0800

添加分支

root@k8s-harbor:~/20231103# git branch  -l 
* master
root@k8s-harbor:~/20231103# git branch  debel 
root@k8s-harbor:~/20231103# git branch  -l debel
* master切换分支
oot@k8s-harbor:~/20231103# git checkout  debel
Switched to branch 'debel'
root@k8s-harbor:~/20231103# git log --pretty=oneline 
c1e2e5f4414613f572ba1824a76d250c862eff0e (HEAD -> debel, tag: ls, origin/master, origin/HEAD, master) 2
50d8a68c810b6d90b691e3d5fa0ce5711f3f2520 (tag: add, tag: 1.1) commit1

和并分支

root@k8s-harbor:~/20231103# git branch  -l debel
* master
root@k8s-harbor:~/20231103# git merge debel