From f46fc2f0429ec46fe689ef1871be13674372bae8 Mon Sep 17 00:00:00 2001
From: TudbuT <forge-public@mail.tudbut.de>
Date: Thu, 31 Oct 2024 17:40:26 +0100
Subject: [PATCH] nixos-edit: rebase when pulling

---
 nixos-edit.script.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos-edit.script.nix b/nixos-edit.script.nix
index ad70663..18234be 100644
--- a/nixos-edit.script.nix
+++ b/nixos-edit.script.nix
@@ -92,7 +92,7 @@ pkgs.writeShellScriptBin "nixos-edit" ''
 
 	cd /etc/nixos
 	if [ "$1" = "pull" ] ; then
-		git pull
+		git pull --rebase
 	fi
 	if [ "$1" = "edit" ] || [ "$1" = "" ] || [ "$1" = "test" ] ; then
 		sudo hx .