From 38b64244ea3ec846d5c8f9813219b069425b967d Mon Sep 17 00:00:00 2001
From: Myned <dev@bjork.tech>
Date: Mon, 31 Mar 2025 19:17:38 -0500
Subject: [PATCH] git: set pull.rebase
---
options/custom/programs/git.nix | 3 +++
1 file changed, 3 insertions(+)
diff --git a/options/custom/programs/git.nix b/options/custom/programs/git.nix
index 1a90ed7..6dfcf17 100644
--- a/options/custom/programs/git.nix
+++ b/options/custom/programs/git.nix
@@ -66,6 +66,9 @@ in {
# https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
merge.conflictStyle = "zdiff3";
+ # https://git-scm.com/docs/git-config#Documentation/git-config.txt-pullrebase
+ pull.rebase = true;
+
# https://git-scm.com/docs/git-config#Documentation/git-config.txt-pushautoSetupRemote
push.autoSetupRemote = true;