about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--home/git/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/home/git/default.nix b/home/git/default.nix
index 855d2c2..8188884 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -20,6 +20,11 @@ in
         color.ui = "true";
         push.default = "simple";
         init.defaultBranch = "main";
+        pull.rebase = true;
+        rebase = {
+          autoStash = true;
+          missingCommitsCheck = "warn";
+        };
         branch.autosetuprebase = "remote";
         branch.sort = "authordate";
         commit.template = "${config.xdg.dataHome}/git/commit.template";