From 6a4337e34fb5cedd1623c5512952d0e63599f815 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 24 Oct 2025 11:45:00 +0900 Subject: [PATCH] home/git: don't delete main/master on `delete-merged` --- home/programs/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/programs/git/default.nix b/home/programs/git/default.nix index dad819c..0d6f047 100644 --- a/home/programs/git/default.nix +++ b/home/programs/git/default.nix @@ -43,7 +43,7 @@ lib.mkIf cfg.enable { aliases = { aliases = "!git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'"; authors = "shortlog --summary --numbered --email"; - delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"; + delete-merged = "!git branch --merged | grep -v -e '\\*' -e 'master' -e 'main' | xargs -n 1 git branch -d"; ff = "fixup-fixup"; fi = "fixup-interactive"; forcepush = "push --force-with-lease --force-if-includes";