diff options
| -rw-r--r-- | home-manager/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home-manager/default.nix b/home-manager/default.nix index 48e42d6..d528cfc 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -134,7 +134,7 @@ pruneTags = true; all = true; }; - pull = {rebase = false;}; + pull = {rebase = true;}; merge = { conflictstyle = "zdiff3"; }; help = { autocorret = "prompt"; }; commit = { verbose = true; }; |