diff options
| author | Marek Paśnikowski <marekpasnikowski@pm.me> | 2023-12-24 14:00:46 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marekpasnikowski@pm.me> | 2023-12-24 14:00:46 +0100 |
| commit | 6112dec917850fa997105bfa5345f35f2a24273c (patch) | |
| tree | e32c8e51ad30658f8d28639e5affc74a213b5aae | |
| parent | 59d568f8babb0f540c95e63a24eae1911ead7cf2 (diff) | |
Fix error with cases of divergent 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 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 " @@ -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 " |