vault backup: 2025-12-17 14:17:38
Affected files: 22.01. 軟體工具、設定/git/delta.md
This commit is contained in:
26
22.01. 軟體工具、設定/git/delta.md
Normal file
26
22.01. 軟體工具、設定/git/delta.md
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
---
|
||||||
|
tags:
|
||||||
|
aliases:
|
||||||
|
date: 2025-12-17
|
||||||
|
time: 14:14:32
|
||||||
|
description:
|
||||||
|
---
|
||||||
|
|
||||||
|
```
|
||||||
|
[core]
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
navigate = true # use n and N to move between diff sections
|
||||||
|
dark = true # or light = true, or omit for auto-detection
|
||||||
|
side-by-side = true
|
||||||
|
line-numbers = true
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictStyle = zdiff3
|
||||||
|
```
|
||||||
|
|
||||||
|
# 參考來源
|
||||||
Reference in New Issue
Block a user