From 3258588fb51f4a6bc431fd2a83f64f5df8990b0d Mon Sep 17 00:00:00 2001
From: dichgrem <brcefy@gmail.com>
Date: Thu, 13 Mar 2025 21:33:37 +0800
Subject: [PATCH] update

---
 content/about-git.md          | 15 +++++++++++++++
 content/awesome-arch-linux.md |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/content/about-git.md b/content/about-git.md
index 2a2948f..e0c614d 100644
--- a/content/about-git.md
+++ b/content/about-git.md
@@ -195,7 +195,22 @@ Archlinux：`sudo pacman -S git`
 `git fetch origin`  
 `git reset --hard origin/master`
 
+## 合并commit记录
 
+```
+git rebase -i HEAD~3
+```
+
+将第二行的 pick 改为 squash (s)：
+```
+pick abc123 First commit message
+squash def456 Second commit message
+```
+
+
+```
+git push origin main --force
+```
 
 ## 修改默认分支
 
diff --git a/content/awesome-arch-linux.md b/content/awesome-arch-linux.md
index 7015150..e55a551 100644
--- a/content/awesome-arch-linux.md
+++ b/content/awesome-arch-linux.md
@@ -33,7 +33,7 @@ VM学习版：https://www.ahhhhfs.com/33472/
 
 
 ## **二、联网并分区**
-1.使用 **dhcpcd** 命令获取IP地址，由于虚拟机使用NAT故联网容易。
+1.使用 **dhcpcd** 命令获取IP地址，由于虚拟机使用NAT故联网容易。如果在实体机安装，使用网线或无线连接，命令为：``nmcli dev wifi connect “wifi名称” password “密码”``
 
 2.使用 **ping www.baidu.com** 命令检查是否联网，若出现ttl,time=xx ms等数据说明成功，随后再 **Ctrl+C** 停止命令运行，~~避免百度被DDOS攻击死掉。~~