From 537d0c4a740598cdc2934dcce24ee0945a714ecf Mon Sep 17 00:00:00 2001 From: Awin Huang Date: Mon, 8 Dec 2025 15:26:24 +0800 Subject: [PATCH] vault backup: 2025-12-08 15:26:24 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Affected files: 21.01. OS/21.01. Linux/00. 重灌基本步驟.md --- 21.01. OS/21.01. Linux/00. 重灌基本步驟.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/21.01. OS/21.01. Linux/00. 重灌基本步驟.md b/21.01. OS/21.01. Linux/00. 重灌基本步驟.md index 99e5c95..fcf45b5 100644 --- a/21.01. OS/21.01. Linux/00. 重灌基本步驟.md +++ b/21.01. OS/21.01. Linux/00. 重灌基本步驟.md @@ -19,18 +19,20 @@ mkdir ~/log 12. 安裝 [delta](https://github.com/dandavison/delta) 1. Goto https://github.com/dandavison/delta/releases and download deb file. 2. Use `dpkg -i file.deb` to install - 3. 修改 `~/.gitconfig`: + 3. 修改 `~/.gitconfig`,加入: ``` [core] pager = delta - + [interactive] - diffFilter = delta --color-only - + diffFilter = delta --color-only --side-by-side + [delta] navigate = true # use n and N to move between diff sections dark = true # or light = true, or omit for auto-detection - + line-numbers = true + side-by-side = true + [merge] conflictStyle = zdiff3 ``` \ No newline at end of file