summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2021-01-02 18:53:10 -0500
committerBen Sima <ben@bsima.me>2021-01-02 18:53:10 -0500
commit8f786888424aad4e5462c17f99e70394bea17732 (patch)
treeec66a8b4fc47f82393fa19b96fc2728e348df582
parent6f478b2454c9d5f140a554a3667086e0e9177dc6 (diff)
git: always pull --rebase
-rw-r--r--linux.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux.nix b/linux.nix
index 4e97fa9..48f73df 100644
--- a/linux.nix
+++ b/linux.nix
@@ -407,6 +407,7 @@ in
};
extraConfig = {
push.default = "simple";
+ pull.rebase = "true";
commit.template = "${./lib/git-commit-template}";
sendemail = {
#smtpuser = "ben@bsima.me";