From 01ca2f2c229f954adcf7ef0df2cb3846fb391224 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 24 Jan 2024 23:44:45 -0500 Subject: [PATCH] gitmergetool = lazygit --- homeConfig/modules/git/config/git.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/homeConfig/modules/git/config/git.nix b/homeConfig/modules/git/config/git.nix index a017dec..c874808 100644 --- a/homeConfig/modules/git/config/git.nix +++ b/homeConfig/modules/git/config/git.nix @@ -6,6 +6,15 @@ extraConfig = { init = { defaultBranch = "main"; }; + mergetool = { + lazygit = { + cmd = "lazygit"; + trustExitCode = true; + }; + }; + merge = { + tool = "lazygit"; + }; }; ignores = [