From b377dadce8e59c56d3fcf45eb44bbdea1ef69565 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sun, 14 Jan 2024 09:51:16 +0100 Subject: Bring back the fix to the error on divergent Git branches --- home-configuration.scm | 4 ++-- izumi.org | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home-configuration.scm b/home-configuration.scm index db0133b..b290fd6 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -152,7 +152,7 @@ (string-append "git -C " configuration-prefix - " pull " + " pull --rebase=true " and "guix home reconfigure " configuration-prefix @@ -161,7 +161,7 @@ (string-append "git -C " configuration-prefix - " pull " + " pull --rebase=true " and "sudo guix system reconfigure " configuration-prefix diff --git a/izumi.org b/izumi.org index 881a1f6..559b2b5 100644 --- a/izumi.org +++ b/izumi.org @@ -806,7 +806,7 @@ (string-append "git -C " configuration-prefix - " pull " + " pull --rebase=true " and "guix home reconfigure " configuration-prefix @@ -815,7 +815,7 @@ (string-append "git -C " configuration-prefix - " pull " + " pull --rebase=true " and "sudo guix system reconfigure " configuration-prefix -- cgit v1.2.3