From 557f3bffb38254629850ab8c2ba5befccd59c2c4 Mon Sep 17 00:00:00 2001 From: Yasmin Teles Date: Thu, 6 Jun 2024 15:39:49 -0300 Subject: [PATCH] feat: improve git diff and git show --- brew/Brewfile | 2 +- git/.gitconfig | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/brew/Brewfile b/brew/Brewfile index 9b63a14..3f3d070 100644 --- 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 index 8048a0c..993c39c 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -51,7 +51,7 @@ prune = true [core] - pager = diff-so-fancy | less --tabs=4 -RFX + pager = delta excludesFile = ~/.gitignore autocrlf = false @@ -59,7 +59,17 @@ 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