summaryrefslogtreecommitdiff
path: root/izumi.org
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2024-01-14 09:51:16 +0100
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2024-01-14 09:51:16 +0100
commitb377dadce8e59c56d3fcf45eb44bbdea1ef69565 (patch)
tree3fd830c6c6d3ef1bd4df0eb70988f73789d8ceca /izumi.org
parentc7eaf561411e852f6adb48c735aec4b69a61cc36 (diff)
Bring back the fix to the error on divergent Git branches
Diffstat (limited to 'izumi.org')
-rw-r--r--izumi.org4
1 files changed, 2 insertions, 2 deletions
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