about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-03-21T04·16+0200
committertazjin <mail@tazj.in>2021-03-21T13·06+0000
commit4a0d978874284730bdc93f9c4d8e27578d205c20 (patch)
tree154b2b78ed5489f61c16292b409f964eedcd80b3
parent298da90dbd3743e7f99b79be230d087910b45fcb (diff)
fix(tazjin/tverskoy): Configure git to always rebase r/2309
Change-Id: I2682e350c74a830682ebca12102d00b7e85093f8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2627
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
-rw-r--r--users/tazjin/nixos/tverskoy/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix
index 8d79e019a5..fe2040a2e5 100644
--- a/users/tazjin/nixos/tverskoy/default.nix
+++ b/users/tazjin/nixos/tverskoy/default.nix
@@ -263,6 +263,9 @@ in lib.fix(self: {
         enable = true;
         userName = "Vincent Ambo";
         userEmail = "mail@tazj.in";
+        extraConfig = {
+          pull.rebase = true;
+        };
       };
     };