From 29192320cdf58a9d82a466231de2dcba3a28a5db Mon Sep 17 00:00:00 2001 From: Connor Johnstone Date: Thu, 1 Oct 2026 10:12:21 -0400 Subject: [PATCH] lazygit: built-in diff first in diffRenderers too; keep pagers for 0.61 The merge kept mainframe's diffRenderers block (written by lazygit 0.65.1's config migration) with delta first, alongside the pagers block. 0.65 reads only diffRenderers, so mainframe defaulted to delta. Co-Authored-By: Claude Opus 5.5 --- common/lazygit/config.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/common/lazygit/config.yml b/common/lazygit/config.yml index 654dd16..3e7ea4c 100644 --- a/common/lazygit/config.yml +++ b/common/lazygit/config.yml @@ -1,12 +1,13 @@ git: - # Cycle between these with | in any diff view. The first is the default. + # Two copies of the same list: lazygit 0.65+ (mainframe) reads diffRenderers, + # older versions (0.61 on sctfw004) read pagers. 0.65 leaves pagers alone when + # diffRenderers is present. Keep them in the same order. | cycles; first is default. + diffRenderers: + - type: rawGit # lazygit's built-in diff, which follows the terminal theme + - type: extDiff + command: difft --color=always + - command: delta --dark --paging=never pagers: - - pager: "" # empty = lazygit's built-in diff, which follows the terminal theme + - pager: "" # empty = built-in diff - externalDiffCommand: difft --color=always - pager: delta --dark --paging=never - # Cycle between these with | in any diff view. - diffRenderers: - - colorArg: always - command: delta --dark --paging=never - - command: difft --color=always - type: extDiff