From 8f786888424aad4e5462c17f99e70394bea17732 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sat, 2 Jan 2021 18:53:10 -0500
Subject: git: always pull --rebase

---
 linux.nix | 1 +
 1 file changed, 1 insertion(+)

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";
-- 
cgit v1.2.3