diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2025-11-30 13:20:01 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2025-11-30 13:20:01 -0700 |
| commit | 5a2f357efb76b7adfcb361c560ae6706f225bbcc (patch) | |
| tree | e773b91a841d26c0ebceeb1c077d16e895fb77da /home-manager/default.nix | |
| parent | 78337f40e9f54edbeea6971f93e9815590099f04 (diff) | |
rebase better than merge
Diffstat (limited to 'home-manager/default.nix')
| -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; }; |