From d4084a869a6e8bf4e9ec0f7f08b6197546fa4bcc Mon Sep 17 00:00:00 2001
From: TheWanderingCrow <contact@wanderingcrow.net>
Date: Sat, 25 Oct 2025 10:24:36 -0400
Subject: [PATCH] have the devshell rebase upstream changes onto our branch
 when we enter it

---
 devshells/default/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devshells/default/default.nix b/devshells/default/default.nix
index 2997aa9..436e307 100644
--- a/devshells/default/default.nix
+++ b/devshells/default/default.nix
@@ -14,5 +14,6 @@ pkgs.mkShell {
 
   shellHook = ''
     jj git fetch
+    jj rebase -d prod
   '';
 }