Git 从零基础到大神：安装、操作、分支与协作指南

Git 从零基础到大神：安装、操作、分支与协作指南 | 极客日志

root@iZbp16khlytibqc83gbmonZ:~# git --version

git version 2.43.0

Command 'git' not found, but can be installed with: apt install git Please ask your administrator.

root@iZbp16khlytibqc83gbmonZ:~# sudo apt-get install git -y

git version 2.43.0

root@iZbp16khlytibqc83gbmonZ:~# mkdir gitcode

root@iZbp16khlytibqc83gbmonZ:~# cd gitcode/

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git init

Initialized empty Git repository in /root/gitcode/.git/

root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls -a .git

root@iZbp16khlytibqc83gbmonZ:~/gitcode# tree .git

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config user.name "Your Name"

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config user.email "[email protected]"

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config -l core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true user.name=Your Name [email protected]

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config --unset user.name root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config -l core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true [email protected]

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config --global user.name "Your Name" root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config --global user.email "[email protected]" root@iZbp16khlytibqc83gbmonZ:~/gitcode# git config -l user.name=Your Name [email protected] core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true

root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls -a .git root@iZbp16khlytibqc83gbmonZ:~/gitcode# touch ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "提交的第一个文件"[master (root-commit) ed2bd0a] 提交的第一个文件 1 file changed, 2 insertions(+) create mode 100644 ReadMe

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log commit ed2bd0a99003808198cfcfae97925b5ef728ac79 (HEAD -> master) Author: hr <[email protected]> Date: Sat Mar 14 16:25:03 2026 +0800 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline ed2bd0a99003808198cfcfae97925b5ef728ac79 (HEAD -> master) 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status On branch master Changes not staged for commit: (use "git add <file>..." to update what will be committed)(use "git restore <file>..." to discard changes in working directory) modified: ReadMe no changes added to commit (use "git add" and/or "git commit -a")

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git diff ReadMediff--git a/ReadMe b/ReadMe index 697685a..ec01bd5 100644 --- a/ReadMe +++ b/ReadMe @@ -1,2 +1,3 @@ hello git +update

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status  On branch master Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: ReadMe

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "modify ReadMe"[master a5e5b49] modify ReadMe 1 file changed, 1 insertion(+) root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status On branch master nothing to commit, working tree clean

版本	v1	v2
内容	git v1	git v2

参数	工作区	暂存区	版本库
–soft	git v2	git v2	git v1
–mixed	git v2	git v1	git v1
–hard	git v1	git v1	git v1

root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls file1 ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline 94c62fe69c0ba0709302f71cd9c226c2fced053c (HEAD -> master) 提交的第三个文件 a5e5b49a4f3cd1c55a11c7a548980ebe445eca62 modify ReadMe ed2bd0a99003808198cfcfae97925b5ef728ac79 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git reset --hard ed2bd0a99003808198cfcfae97925b5ef728ac79 HEAD is now at ed2bd0a 提交的第一个文件 root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline ed2bd0a99003808198cfcfae97925b5ef728ac79 (HEAD -> master) 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline ed2bd0a99003808198cfcfae97925b5ef728ac79 (HEAD -> master) 提交的第一个文件 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git reset --hard 94c62fe69c0ba0709302f71cd9c226c2fced053c HEAD is now at 94c62fe 提交的第三个文件 root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls file1 ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline 94c62fe69c0ba0709302f71cd9c226c2fced053c (HEAD -> master) 提交的第三个文件 a5e5b49a4f3cd1c55a11c7a548980ebe445eca62 modify ReadMe ed2bd0a99003808198cfcfae97925b5ef728ac79 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git reflog 94c62fe (HEAD -> master) HEAD@{0}: reset: moving to 94c62fe69c0ba0709302f71cd9c226c2fced053c ed2bd0a HEAD@{1}: reset: moving to ed2bd0a99003808198cfcfae97925b5ef728ac79 94c62fe (HEAD -> master) HEAD@{2}: commit: 提交的第三个文件 a5e5b49 HEAD@{3}: commit: modify ReadMe ed2bd0a HEAD@{4}: commit (initial): 提交的第一个文件 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git reset --hard 94c62fe root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline 94c62fe69c0ba0709302f71cd9c226c2fced053c (HEAD -> master) 提交的第三个文件 a5e5b49a4f3cd1c55a11c7a548980ebe445eca62 modify ReadMe ed2bd0a99003808198cfcfae97925b5ef728ac79 提交的第一个文件

工作区	暂存区	版本库	解决方法	说明
xxx code			1.手动撤销—不推荐，容易出错 2. `git checkout -- [file]` —推荐	⽂件回到最近⼀次 add 或 commit 时的状态
xxx code	xxx code		1.`git reset --mixed HEAD [file]` 后继续`git checkout -- [file]` 2. `git reset --hard HEAD [file]`	1 方法是在你还没有 commit 到版本库里利用 mixed 版本回退暂存区内容，再 git checkout 回退工作区内容。（HEAD 表示回退到当前版本，回到上一个版本 HEAD^ 以此类推加上^) 2 方法本质上是利用 hard 的版本回退来撤销修改
xxx code	xxx code	xxx code	`git reset --hard HEAD^`	回退到上⼀个版本，但是有个前提条件还没有把⾃⼰的本地版本库推送到远程（commit 之后没有 push）

root@iZbp16khlytibqc83gbmonZ:~/gitcode# rm file1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status On branch master Changes not staged for commit: (use "git add/rm <file>..." to update what will be committed)(use "git restore <file>..." to discard changes in working directory) deleted: file1 no changes added to commit (use "git add" and/or "git commit -a")

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add file1  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "delete file1"[master 486fd34] delete file1 1 file changed, 1 deletion(-) delete mode 100644 file1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# ls ReadMe

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git rm file1 rm'file1' root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status On branch master Changes to be committed: (use "git restore --staged <file>..." to unstage) deleted: file1

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "delete file1"[master 9123342] delete file1 1 file changed, 1 deletion(-) delete mode 100644 file1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status On branch master nothing to commit, working tree clean

root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/HEAD  ref: refs/heads/master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/refs/heads/master  912334249d8315f1ba88953158a819c913c1e5e8 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --pretty=oneline 912334249d8315f1ba88953158a819c913c1e5e8 (HEAD -> master) delete file1 94c62fe69c0ba0709302f71cd9c226c2fced053c 提交的第三个文件 a5e5b49a4f3cd1c55a11c7a548980ebe445eca62 modify ReadMe ed2bd0a99003808198cfcfae97925b5ef728ac79 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch* master

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch dev root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch  dev * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/HEAD  ref: refs/heads/master

root@iZbp16khlytibqc83gbmonZ:~/gitcode# tree .git

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout dev Switched to branch 'dev' root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch * dev master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/HEAD  ref: refs/heads/dev

root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "md ReadMe"[dev 034add1] md ReadMe 1 file changed, 1 insertion(+)

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout master  Switched to branch 'master' root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout dev Switched to branch 'dev' root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev

root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/refs/heads/dev  034add12801fd3f42a2e312e341c42071f0fb1b4 root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/refs/heads/master  912334249d8315f1ba88953158a819c913c1e5e8 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git cat-file -p 034add12801fd3f42a2e312e341c42071f0fb1b4 tree ed29087415cd1b65518cf761fecc8fd030924813 parent 912334249d8315f1ba88953158a819c913c1e5e8 author hr <[email protected]> 1773543349 +0800 committer hr <[email protected]> 1773543349 +0800 md ReadM

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch * dev master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/refs/heads/dev  034add12801fd3f42a2e312e341c42071f0fb1b4 root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch * dev master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout master # 切换到 master 上进⾏合并 Switched to branch 'master' root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/refs/heads/master  912334249d8315f1ba88953158a819c913c1e5e8 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch  dev * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git merge dev # 合并 dev 分⽀ Updating 9123342..034add1 Fast-forward ReadMe | 1 + 1 file changed, 1 insertion(+) root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat .git/refs/heads/master  034add12801fd3f42a2e312e341c42071f0fb1b4

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch dev * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch -d dev Deleted branch dev (was 034add1). root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch* master

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout -b dev1 Switched to a new branch 'dev1' root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch * dev1 master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev1 dev1 dev1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status  On branch dev1 Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "md ReadMe:dev1 dev1 dev1"[dev1 1351a58] md ReadMe:dev1 dev1 dev1 1 file changed, 1 insertion(+), 1 deletion(-) root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status  On branch dev1 nothing to commit, working tree clean

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout master  Switched to branch 'master' root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch  dev1 * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch  dev1 * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update dev dev dev root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status  On branch master Changes to be committed: (use "git restore --staged <file>..." to unstage) modified: ReadMe root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "md ReadMe:master master master"[master 0bd1cff] md ReadMe:master master master 1 file changed, 1 insertion(+), 1 deletion(-) root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status  On branch master nothing to commit, working tree clean root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch  dev1 * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git merge dev1  Auto-merging ReadMe CONFLICT (content): Merge conflict in ReadMe Automatic merge failed; fix conflicts and then commit the result.

root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  hello git update <<<<<<< HEAD master master master ======= dev1 dev1 dev1 >>>>>>> dev1 ~

root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git status  On branch master All conflicts fixed but you are still merging.(use "git commit" to conclude merge) root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "merge dev1"[master f25393a] merge dev1

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "merge dev1"[master f25393a] merge dev1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --graph --pretty=oneline --abbrev-commit* f25393a (HEAD -> master) merge dev1 |\ |* 1351a58 (dev1) md ReadMe:dev1 dev1 dev1 *| 0bd1cff md ReadMe:master master master |/* 034add1 md ReadMe * 9123342 delete file1 * 94c62fe 提交的第三个文件 * a5e5b49 modify ReadMe * ed2bd0a 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch dev1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch  dev1 * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout dev1 Switched to branch 'dev1' root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master root@iZbp16khlytibqc83gbmonZ:~/gitcode# vim ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master dev1 dev1 dev1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git add ReadMe  root@iZbp16khlytibqc83gbmonZ:~/gitcode# git commit -m "md RM:dev1 dev1 dev1"[dev1 704e72d] md RM:dev1 dev1 dev1 1 file changed, 1 insertion(+) root@iZbp16khlytibqc83gbmonZ:~/gitcode# git checkout master  Switched to branch 'master' root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git merge dev1 Updating 8dae404..704e72d Fast-forward ReadMe | 1 + 1 file changed, 1 insertion(+) root@iZbp16khlytibqc83gbmonZ:~/gitcode# cat ReadMe  hello git update master master master dev1 dev1 dev1 root@iZbp16khlytibqc83gbmonZ:~/gitcode# git log --graph --pretty=oneline --abbrev-commit* 704e72d (HEAD -> master, dev1) md RM:dev1 dev1 dev1 * 8dae404 md RM* 4dcea7f md ReadMe * f25393a merge dev1 |\ |* 1351a58 md ReadMe:dev1 dev1 dev1 *| 0bd1cff md ReadMe:master master master |/* 034add1 md ReadMe * 9123342 delete file1 * 94c62fe 提交的第三个文件 * a5e5b49 modify ReadMe * ed2bd0a 提交的第一个文件

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch -d dev3  error: The branch 'dev3' is not fully merged.If you are sure you want to delete it, run 'git branch -D dev3'

root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch dev3 * master root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch -D dev3  Deleted branch dev3 (was cd2f149). root@iZbp16khlytibqc83gbmonZ:~/gitcode# git branch * master

root@iZbp16khlytibqc83gbmonZ:~# git clone https://gitee.com/hrKiley/remove-gitcode.git Cloning into 'remove-gitcode'... remote: Enumerating objects: 7, done. remote: Counting objects: 100% (7/7), done. remote: Compressing objects: 100% (7/7), done. remote: Total 7 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0) Receiving objects: 100% (7/7), done. root@iZbp16khlytibqc83gbmonZ:~# ls gitcode remove-gitcode root@iZbp16khlytibqc83gbmonZ:~# cd remove-gitcode/ root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# ls -a .git .gitee README.en.md README.md

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git remote origin

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git remote -v origin https://gitee.com/hrKiley/remove-gitcode.git (fetch) origin https://gitee.com/hrKiley/remove-gitcode.git (push)

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch * master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# touch file.txt root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# vim file.txt  root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat file.txt  create file root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git add file.txt  root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git commit -m "create file"[master 4786ad7] create file 1 file changed, 1 insertion(+) create mode 100644 file.txt root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch master Your branch is ahead of 'origin/master' by 1 commit.(use "git push" to publish your local commits) nothing to commit, working tree clean

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push origin master:master Username for'https://gitee.com': hrKiley Password for'https://[email protected]': Enumerating objects: 4, done. Counting objects: 100% (4/4), done. Delta compression using up to 2 threads Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 274 bytes | 274.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag 45440bb8 To https://gitee.com/hrKiley/remove-gitcode.git 22577a3..4786ad7 master -> master

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git pull origin master:master remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (3/3), 957 bytes | 957.00 KiB/s, done.From https://gitee.com/hrKiley/remove-gitcode 4786ad7..e4931b9 master -> master 4786ad7..e4931b9 master -> origin/master warning: fetch updated the current branch head. fast-forwarding your working tree from commit 4786ad782154384f9b005ce959cd7b82720d4456. Already up to date.

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# touch s.so root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# touch i.ini root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# ls file.txt i.ini README.en.md README.md s.so root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# vim .gitignore root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# ls -a file.txt .git .gitee .gitignore i.ini README.en.md README.md s.so root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat .gitignore# 可以直接写文件名*.so *.ini

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch master Your branch is up to date with 'origin/master'. Untracked files: (use "git add <file>..." to include in what will be committed).gitignore no changes added to commit (use "git add" and/or "git commit -a") root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git add . root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged <file>..." to unstage) new file: .gitignore

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# vim .gitignore  root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat .gitignore # 可以直接写文件名*.so *.ini !s.so root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged <file>..." to unstage) new file: .gitignore Untracked files: (use "git add <file>..." to include in what will be committed) s.so

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# ls -a file.txt .git .gitee .gitignore i.ini README.en.md README.md s.so root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat .gitignore # 可以直接写文件名*.so *.ini root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged <file>..." to unstage) new file: .gitignore root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git add -f s.so root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch master Your branch is up to date with 'origin/master'. Changes to be committed: (use "git restore --staged <file>..." to unstage) new file: .gitignore new file: s.so

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git check-ignore -v a.so.gitignore:3:*.so a.so

git config --global alias.st status

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v1.0

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag  v1.0

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git log commit e69a90453c0d6f08020d309ea748a57f122e9800 (HEAD -> master, tag: v1.0) Author: hrKiley <[email protected]> Date: Mon Mar 16 16:51:34 2026 +0800 测试忽略特殊文件 commit e4931b90148380961d2f4612bf38bbef6e6f7a56 (origin/master, origin/HEAD) Author: 好人 <[email protected]> Date: Sun Mar 15 13:50:05 2026 +0000 update file.txt. Signed-off-by: 好人 <[email protected]> root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.9 e4931b90148380961d2f4612bf38bbef6e6f7a56 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.9 v1.0

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.8 -m "important tag:XX" 4786ad782154384f9b005ce959cd7b82720d4456 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.8 v0.9 v1.0 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git show v0.8 tag v0.8 Tagger: hrKiley <[email protected]> Date: Mon Mar 16 17:26:14 2026 +0800 important tag:XX commit 4786ad782154384f9b005ce959cd7b82720d4456 (tag: v0.8) Author: hrKiley <[email protected]> Date: Sun Mar 15 21:10:55 2026 +0800 create file diff--git a/file.txt b/file.txt new file mode 100644 index 0000000..ad80c42 ---/dev/null +++ b/file.txt @@ -0,0 +1 @@ +create file

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.8 v0.9 v1.0 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag -d v1.0 Deleted tag 'v1.0'(was e69a904) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.8 v0.9

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.8 v0.9 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push origin v0.8 Username for'https://gitee.com': hrKiley Password for'https://[email protected]': Enumerating objects: 1, done. Counting objects: 100% (1/1), done. Writing objects: 100% (1/1), 165 bytes | 165.00 KiB/s, done. Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag 404795a5 To https://gitee.com/hrKiley/remove-gitcode.git *[new tag] v0.8 -> v0.8

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag -d v0.8 Deleted tag 'v0.8'(was 25f8881) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.9

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag -d v0.8 Deleted tag 'v0.8'(was 25f8881) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git tag v0.9 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push origin :v0.8 Username for'https://gitee.com': hrKiley Password for'https://[email protected]': remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag f54d628d To https://gitee.com/hrKiley/remove-gitcode.git -[deleted] v0.8

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch * master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch -r origin/HEAD -> origin/master origin/master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git pull From https://gitee.com/hrKiley/remove-gitcode*[new branch] dev -> origin/dev Already up to date. root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch -r origin/HEAD -> origin/master origin/dev origin/master

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git checkout -b dev origin/dev branch 'dev'set up to track 'origin/dev'. Switched to a new branch 'dev'

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch -vv* dev e4931b9 [origin/dev] update file.txt. master e69a904 [origin/master: ahead 1] 测试忽略特殊文件

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# vim file.txt  root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat file.txt  create file pull aaa root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git status  On branch dev Your branch is up to date with 'origin/dev'. Changes not staged for commit: (use "git add <file>..." to update what will be committed)(use "git restore <file>..." to discard changes in working directory) modified: file.txt Untracked files: (use "git add <file>..." to include in what will be committed) i.ini no changes added to commit (use "git add" and/or "git commit -a") root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git add file.txt  root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git commit -m "md file:aaa"[dev dcad356] md file:aaa 1 file changed, 2 insertions(+), 1 deletion(-) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push Username for'https://gitee.com': hrKiley Password for'https://[email protected]': Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 2 threads Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 270 bytes | 270.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag 59434582 To https://gitee.com/hrKiley/remove-gitcode.git e4931b9..dcad356 dev -> dev

PS D:\code\tests\remove-gitcode> git checkout -b dev origin/dev Switched to a new branch 'dev' Branch 'dev'set up to track remote branch 'dev'from'origin'.PS D:\code\tests\remove-gitcode> git branch -vv * dev e4931b9 [origin/dev] update file.txt. master e4931b9 [origin/master] update file.txt.

PS D:\code\tests\remove-gitcode> cat.\file.txt create file pull bbb PS D:\code\tests\remove-gitcode> git add .\file.txt PS D:\code\tests\remove-gitcode> git commit -m "md file:bbb"[dev 711c72e] md file:bbb 1 file changed, 2 insertions(+), 1 deletion(-)PS D:\code\tests\remove-gitcode> git push info: detecting host provider for'https://gitee.com/'... info: detecting host provider for'https://gitee.com/'... info: detecting host provider for'https://gitee.com/'... To https://gitee.com/hrKiley/remove-gitcode.git ![rejected] dev -> dev (fetch first) error: failed to push some refs to 'https://gitee.com/hrKiley/remove-gitcode.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g.,'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help'for details.

hint: (e.g.,'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help'for details.

PS D:\code\tests\remove-gitcode> git pull remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (2/2), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (3/3), 250 bytes | 62.00 KiB/s, done.From https://gitee.com/hrKiley/remove-gitcode e4931b9..dcad356 dev -> origin/dev Auto-merging file.txt CONFLICT (content): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result.

PS D:\code\tests\remove-gitcode> cat.\file.txt create file pull bbb aaa PS D:\code\tests\remove-gitcode> git status On branch dev Your branch and 'origin/dev' have diverged, and have 1 and 1 different commits each, respectively.(use "git pull" to merge the remote branch into yours) You have unmerged paths.(fix conflicts and run "git commit")(use "git merge --abort" to abort the merge) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: file.txt no changes added to commit (use "git add" and/or "git commit -a")PS D:\code\tests\remove-gitcode> git add .\file.txt PS D:\code\tests\remove-gitcode> git commit -m "merge dev"[dev e95ebf8] merge dev PS D:\code\tests\remove-gitcode> git push info: detecting host provider for'https://gitee.com/'... info: detecting host provider for'https://gitee.com/'... info: detecting host provider for'https://gitee.com/'... warning: auto-detection of host provider took too long (>2000ms) warning: see https://aka.ms/gcmcore-autodetect for more information. Enumerating objects: 10, done. Counting objects: 100% (10/10), done. Delta compression using up to 16 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 536 bytes | 536.00 KiB/s, done. Total 6 (delta 2), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag a14c5691 To https://gitee.com/hrKiley/remove-gitcode.git dcad356..e95ebf8 dev -> dev

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch * dev master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git pull remote: Enumerating objects: 10, done. remote: Counting objects: 100% (10/10), done. remote: Compressing objects: 100% (4/4), done. remote: Total 6 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) Unpacking objects: 100% (6/6), 516 bytes | 516.00 KiB/s, done.From https://gitee.com/hrKiley/remove-gitcode dcad356..e95ebf8 dev -> origin/dev Updating dcad356..e95ebf8 Fast-forward file.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat file.txt  create file pull bbb aaa

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 1 commit.(use "git push" to publish your local commits) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch  dev * master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git pull Already up to date.

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git checkout dev Switched to branch 'dev' Your branch is up to date with 'origin/dev'. root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch * dev master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git merge master Already up to date.

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 1 commit.(use "git push" to publish your local commits) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git branch  dev * master root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git merge dev Updating e69a904..84a529b Fast-forward file.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat file.txt  create file pull bbb aaa

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push Username for'https://gitee.com': hrKiley Password for'https://[email protected]': Enumerating objects: 8, done. Counting objects: 100% (8/8), done. Delta compression using up to 2 threads Compressing objects: 100% (4/4), done. Writing objects: 100% (6/6), 614 bytes | 614.00 KiB/s, done. Total 6 (delta 2), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag d444c094 To https://gitee.com/hrKiley/remove-gitcode.git e4931b9..84a529b master -> master

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git checkout -b feature-1  Switched to a new branch 'feature-1' root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# vim function1 root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# cat function1  i am coding... Done! root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git add function1  root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git commit -m "add func1"[feature-1 cf5b1f6] add func1 1 file changed, 2 insertions(+) create mode 100644 function1

root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push #推送失败 fatal: The current branch feature-1 has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin feature-1 To have this happen automatically for branches without a tracking upstream, see 'push.autoSetupRemote' in 'git help config'. root@iZbp16khlytibqc83gbmonZ:~/remove-gitcode# git push origin feature-1 Username for'https://gitee.com': hrKiley Password for'https://[email protected]': Enumerating objects: 4, done. Counting objects: 100% (4/4), done. Delta compression using up to 2 threads Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 281 bytes | 281.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag 4a48b7a1 remote: Create a pull request for'feature-1' on Gitee by visiting: remote: https://gitee.com/hrKiley/remove-gitcode/pull/new/hrKiley:feature-1...hrKiley:master To https://gitee.com/hrKiley/remove-gitcode.git *[new branch] feature-1 -> feature-1

PS D:\code\tests\remove-gitcode> git checkout master Switched to branch 'master'PS D:\code\tests\remove-gitcode> git pull Updating e4931b9..84a529b Fast-forward .gitignore | 4 ++++ file.txt | 4 +++- s.so | 0 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 s.so

PS D:\code\tests\remove-gitcode> git checkout -b feature-2 Switched to a new branch 'feature-2'

PS D:\code\tests\remove-gitcode> cat.\function2.txt i am coding...PS D:\code\tests\remove-gitcode> git add .\function2.txt PS D:\code\tests\remove-gitcode> git commit -m "add func2"[feature-2 1e90852] add func2 1 file changed, 1 insertion(+) create mode 100644 function2.txt

PS D:\code\tests\remove-gitcode> git commit -m "add func2"[feature-2 1e90852] add func2 1 file changed, 1 insertion(+) create mode 100644 function2.txt PS D:\code\tests\remove-gitcode> git push origin feature-2 info: detecting host provider for'https://gitee.com/'... info: detecting host provider for'https://gitee.com/'... info: detecting host provider for'https://gitee.com/'... Enumerating objects: 4, done. Counting objects: 100% (4/4), done. Delta compression using up to 16 threads Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 278 bytes | 278.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: Powered by GITEE.COM [1.1.23] remote: Set trace flag e34fdc8b remote: Create a pull request for'feature-2' on Gitee by visiting: remote: https://gitee.com/hrKiley/remove-gitcode/pull/new/hrKiley:feature-2...hrKiley:master To https://gitee.com/hrKiley/remove-gitcode.git *[new branch] feature-2 -> feature-2