From 958bc01404cc6213c30cdbad253fa82b55daeec2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 31 Jul 2025 12:50:11 +0900 Subject: [PATCH] gitconfig: Relax useAutoBase. It can be useful to produce patches from older commits, for example to share commits from the keyring branch between the main Guix repository and guix-maintenance. The previous 'true' value prevented that with a fatal error message. * etc/git/gitconfig [format] : Set to whenAble. Change-Id: Ib32407dd3695dcadcb16855b1b87147fabc2aca7 --- etc/git/gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/git/gitconfig b/etc/git/gitconfig index 9c7827ced2b..4dc2f696062 100644 --- a/etc/git/gitconfig +++ b/etc/git/gitconfig @@ -7,7 +7,7 @@ [format] forceinbodyfrom = true # help preserve commit authorship thread = shallow - useAutoBase = true + useAutoBase = whenAble [pull] rebase = true