From 9b531043e33dff193f11202abbb388aef5b00435 Mon Sep 17 00:00:00 2001
From: daniel <48235622+1024daniel@users.noreply.github.com>
Date: Fri, 7 Feb 2025 09:09:07 +0800
Subject: [PATCH] Update content
 src/site/notes/OperatingSystem/Linux/git/git.md

---
 .../notes/OperatingSystem/Linux/git/git.md    | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/site/notes/OperatingSystem/Linux/git/git.md b/src/site/notes/OperatingSystem/Linux/git/git.md
index c9b5a05..7c6fb4e 100644
--- a/src/site/notes/OperatingSystem/Linux/git/git.md
+++ b/src/site/notes/OperatingSystem/Linux/git/git.md
@@ -54,7 +54,15 @@ git push
 
 ```
 
-## 日志
+### commit
+
+```sh
+# 修改上一次的
+git log --amend
+
+```
+
+## log
 
 ```bash
 git log --oneline
@@ -204,14 +212,20 @@ git stash clear
 ```bash
 ## 针对最近4个commit进行交互式rebase修改，
 git rebase -i HEAD~4
-
+# merge模式: 当本地和远程都有一个commit没有同步，rebase之后会额外创建一个merge commit
+git config pull.rebase false
+# rebase模式: 当本地和远程都有一个commit没有同步，rebase之后不会创建merge commit
+git config pull.rebase true
 ```
-
-
+![Pasted image 20250207000434.png](/img/user/OperatingSystem/Linux/git/attachments/Pasted%20image%2020250207000434.png)
 
 ### reset
 
 ```sh
 git reset 
 
-```
\ No newline at end of file
+```
+
+
+
+