git: add delta

ShuN6211 · Dec 20, 2024 · 2c3f204 · 2c3f204
1 parent e2cda5a
commit 2c3f204
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/config/git/config b/config/git/config
@@ -17,6 +17,11 @@
 
 [delta]
     line-numbers = true
+    side-by-side = true
+    navigate = true
+
+[merge]
+    conflictstyle = zdiff3
 
 [ghq]
 	root = ~/workspace

diff --git a/config/homebrew/Brewfile b/config/homebrew/Brewfile
@@ -9,6 +9,7 @@ brew "fd"
 brew "fzf"
 brew "ghq"
 brew "git"
+brew "git-delta"
 brew "gnu-sed"
 brew "gnupg"
 brew "grep"

diff --git a/scripts/setup-sheldon.bash b/scripts/setup-sheldon.bash
@@ -10,4 +10,4 @@ else
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | /bin/sh -s -- -y --no-modify-path
 fi
 
-"$CARGO_HOME/bin/cargo" install sheldon
+"$CARGO_HOME/bin/cargo" install sheldon git-delta