diff options
| author | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-01-14 09:51:15 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marek@marekpasnikowski.pl> | 2024-01-14 09:51:15 +0100 |
| commit | fed7905485fafdc7819abc125e5e04b0c4061c01 (patch) | |
| tree | e32c8e51ad30658f8d28639e5affc74a213b5aae /home-configuration.scm | |
| parent | d9d1411461902dfbfa20d73b17bd58b2c4cf82db (diff) | |
Fix error with cases of divergent branches
Diffstat (limited to 'home-configuration.scm')
| -rw-r--r-- | home-configuration.scm | 4 |
1 files changed, 2 insertions, 2 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 " |