From 80d1ed1528246e690a22c114ca18fe4e4182910a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Thu, 5 Feb 2026 10:44:12 +0100 Subject: [PATCH] Improve git config --- git/.config/git/config | 5 +++-- jj/.config/jj/config.toml | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/git/.config/git/config b/git/.config/git/config index b6f220d..4a065de 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -5,8 +5,9 @@ [core] pager = delta +[delta] + side-by-side = true + [includeIf "gitdir:~/git/work/tcs/"] path = tcs.config -[delta] - side-by-side = true diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml index 3cb49e8..6929aa0 100644 --- a/jj/.config/jj/config.toml +++ b/jj/.config/jj/config.toml @@ -2,16 +2,19 @@ [user] name = "J. Fernando Sánchez" -email = "f.sanchez@thechannelstore.tv" +email = "j@sanchezrada.es" [[--scope]] ---when.repositories = ["~/git/personal/"] +--when.repositories = ["~/git/work/tcs"] [--scope.user] -email = "j@sanchezrada.es" +name = "J. Fernando Sánchez" +email = "f.sanchez@thechannelstore.tv" + [ui] pager = "delta" #":builtin" diff-formatter=":git" +paginate = "auto" [merge-tools.delta] -diff-args=["--side-by-side", "$left", "$right", "--width=$width"] +diff-args=["--color-only", "--side-by-side", "$left", "$right", "--width=$width"]