From 5b5359a37a28d153f69e94933f17b6dd36406acd Mon Sep 17 00:00:00 2001 From: xdr_computer <2192922027@qq.com> Date: Sun, 5 Oct 2025 12:48:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Readme.md | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 Readme.md diff --git a/Readme.md b/Readme.md new file mode 100644 index 0000000..5884d19 --- /dev/null +++ b/Readme.md @@ -0,0 +1,143 @@ +# git的使用方法 + +""和''中间的内容是需要修改的 ()部分是需要修改成对应信息的 + +首次使用git需要对git初始化 + +``` +git config --global user.name "用户名” +git config --global user.emai "邮箱” +``` + +首先在需要建仓的地方 + +``` +git init +``` + +克隆仓库 + +``` +git clone ssh://git@8.152.216.76:2222/xdr_gitea/rtos.git +``` + +添加到暂存区 + +``` +git add "文件名(所有.)" +``` + +添加到本地仓库(待提交到云端) + +``` +git commit -m "需要添加的信息" +``` + +查看节点 + +``` +git log +``` + +查看每个版本的区别 + +``` +git log --stat +或 +git diff (commit id) +``` + +回退版本 + +``` +git reset --hard (commit id) +``` + +查看分支 + +``` +git branch +``` + +*master:自动创建,一般用于保存稳定的代码 + +创建分支 + +``` +git checkout -b (develop) +``` + +*develop:一般用来保存开法过程中的代码 + +切换分支 + +``` +git checkout (分支) +``` + +合并分支内容 + +``` +git merge (分支) +``` + +关联远程仓库 + +1. 检查现有远程配置 + + ``` + git remote -v + ``` + + - 若未显示 origin 或 URL 不正确,需关联或更新远程仓库: + + ``` + git remote add (origin变量名代指地址) (地址)/(用户名)/(仓库名).git + git remote add origin ssh://git@8.152.216.76:2222/xdr_gitea/rtos.git + ``` + +推送至远程仓库 + +``` +git push -u origin (master分支名) +``` + +### 🛠️ 完整解决步骤(Windows PowerShell) + +#### 1. 彻底清除旧密钥记录 + +powershell + +复制 + +``` +# 删除该主机所有旧的密钥记录 +ssh-keygen -R "8.152.216.76:2222" +ssh-keygen -R "[8.152.216.76]:2222" +``` + +#### 2. 手动编辑 known_hosts 文件(双重保险) + +1. 打开文件资源管理器,进入:`C:\Users\syx\.ssh` +2. 右键用记事本打开 `known_hosts`文件 +3. **删除所有包含 `8.152.216.76`或 `[8.152.216.76]:2222`的行** +4. 保存文件 + +#### 3. 重新获取并信任新密钥 + +powershell + +复制 + +``` +# 获取新密钥并添加到 known_hosts +ssh-keyscan -p 2222 8.152.216.76 | Out-File -FilePath "$env:USERPROFILE\.ssh\known_hosts" -Append -Encoding ASCII + +# 强制验证连接(会提示确认指纹) +ssh -p 2222 git@8.152.216.76 +``` + +当出现 `Are you sure you want to continue connecting (yes/no)?`时: + +- 先核对指纹是否与之前显示的 `SHA256:FBNJ48Ps1b1k2szbW+1S+n0yl2RIQekHV1OzOD/KkkE`一致 +- 确认一致后输入 `yes`