From fed7905485fafdc7819abc125e5e04b0c4061c01 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sun, 14 Jan 2024 09:51:15 +0100 Subject: Fix error with cases of divergent 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 8bccc5f..d3dec78 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -148,7 +148,7 @@ (pull-guix "guix pull ") (reconfigure-home (string-append - "git pull " + "git pull --rebase=true " configuration-prefix and "guix home reconfigure " @@ -156,7 +156,7 @@ "home-configuration.scm")) (reconfigure-system (string-append - "git pull " + "git pull --rebase=true " configuration-prefix and "sudo guix system reconfigure " diff --git a/izumi.org b/izumi.org index 0b1bfcb..ee4c904 100644 --- a/izumi.org +++ b/izumi.org @@ -802,7 +802,7 @@ (pull-guix "guix pull ") (reconfigure-home (string-append - "git pull " + "git pull --rebase=true " configuration-prefix and "guix home reconfigure " @@ -810,7 +810,7 @@ "home-configuration.scm")) (reconfigure-system (string-append - "git pull " + "git pull --rebase=true " configuration-prefix and "sudo guix system reconfigure " -- cgit v1.2.3