about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-06-20 14:32:11 -0700
committerFranck Cuny <franck@fcuny.net>2022-06-20 14:41:40 -0700
commit67d0b46bec633f2b8928a447992c9a0f56109987 (patch)
treef89f2f7327e27ad669bf5b2a36e469ff153f3a6b
parentfix(home/emacs): install the package nixpkgs-fmt (diff)
downloadworld-67d0b46bec633f2b8928a447992c9a0f56109987.tar.gz
feat(home/git): add a few more options in the default configuration
Change-Id: I14c7b3349973db99c01c102c57f453840f284612
Reviewed-on: https://cl.fcuny.net/c/world/+/460
Tested-by: CI
Reviewed-by: Franck Cuny <franck@fcuny.net>
Diffstat (limited to '')
-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";