From 21451d5a8f423a9446a0f17c7d392c18e2982492 Mon Sep 17 00:00:00 2001 From: liv Date: Fri, 4 Oct 2024 12:40:45 +0200 Subject: [PATCH] home: specify rebase as default git merge strategy --- home/global.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home/global.nix b/home/global.nix index 935ea66..d5b5b98 100644 --- a/home/global.nix +++ b/home/global.nix @@ -28,7 +28,10 @@ enable = true; userEmail = "shadows@with.al"; userName = "liv"; - extraConfig = { init = { defaultBranch = "main"; }; }; + extraConfig = { + init.defaultBranch = "main"; + pull.rebase = true; + }; }; programs.jujutsu = {