From 67d0b46bec633f2b8928a447992c9a0f56109987 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Mon, 20 Jun 2022 14:32:11 -0700 Subject: 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 --- home/git/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'home/git/default.nix') 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"; -- cgit 1.4.1