From fed7905485fafdc7819abc125e5e04b0c4061c01 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Sun, 14 Jan 2024 09:51:15 +0100
Subject: Fix error with cases of divergent branches

---
 izumi.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'izumi.org')

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