diff options
| author | Marek Paśnikowski <marekpasnikowski@pm.me> | 2023-12-26 06:14:43 +0100 |
|---|---|---|
| committer | Marek Paśnikowski <marekpasnikowski@pm.me> | 2023-12-26 06:14:43 +0100 |
| commit | ca22c122d0ca469d4c20120c064580f00b207ee3 (patch) | |
| tree | 3fd830c6c6d3ef1bd4df0eb70988f73789d8ceca /home-configuration.scm | |
| parent | 7890c19a68ff4a95fb26882de191f7853ff5b55a (diff) | |
Bring back the fix to the error on divergent Git 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 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 |