diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-01-14 09:51:16 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-01-14 09:51:16 +0100 |
| commit | b377dadce8e59c56d3fcf45eb44bbdea1ef69565 (patch) | |
| tree | 3fd830c6c6d3ef1bd4df0eb70988f73789d8ceca | |
| parent | c7eaf561411e852f6adb48c735aec4b69a61cc36 (diff) | |
Bring back the fix to the error on divergent Git branches
| -rw-r--r-- | home-configuration.scm | 4 | ||||
| -rw-r--r-- | 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 @@ -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 |