From 345be56b649a86ecab577b06c921a24bcdef32b4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 16 Jul 2020 14:35:29 +0200 Subject: workstation: Disable pull.rebase in Git config From the release notes of Git version 2.27.0: * "git pull" issues a warning message until the pull.rebase configuration variable is explicitly given, which some existing users may find annoying---those who prefer not to rebase need to set the variable to false to squelch the warning. This is exactly the warning which is annoying me all the time now, so in order to get rid of it, let's explicitly set the default behaviour (which is doing a recursive merge). Just to be sure that I really want the default behaviour, I analysed my shell history for invocations of "git pull" and only around 20% of the invocations were with --rebase, 14% were with an explicit URL (but no rebase) and the rest were recursive merges. Signed-off-by: aszlig --- modules/user/aszlig/profiles/workstation/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index 862962db..bf7385ab 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -79,6 +79,7 @@ in { rerere.enabled = true; rerere.autoupdate = true; commit.gpgsign = true; + pull.rebase = false; alias.backport = let release = "14.04"; -- cgit 1.4.1