feat: improve git diff and git show

YasminTeles · Jun 6, 2024 · 557f3bf · 557f3bf
1 parent dec3015
commit 557f3bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/brew/Brewfile b/brew/Brewfile
@@ -21,8 +21,8 @@ brew "gh"
 brew "eza"
 brew "bat"
 brew "make"
-brew "diff-so-fancy"
 brew "fzf"
+brew "git-delta"
 
 # Docker
 brew "docker"

diff --git a/git/.gitconfig b/git/.gitconfig
@@ -51,15 +51,25 @@
 	prune = true
 
 [core]
-	pager = diff-so-fancy | less --tabs=4 -RFX
+	pager = delta
 	excludesFile = ~/.gitignore
 	autocrlf = false
 
 [commit]
 	template = ~/.gitmessage
 
 [interactive]
-	diffFilter = diff-so-fancy --patch
+	diffFilter = delta --color-only
 
 [init]
 	defaultBranch = main
+
+[delta]
+  navigate = true
+  side-by-side = true
+
+[merge]
+  conflictstyle = diff3
+
+[diff]
+  colorMoved = default