oysteikt/nix-dotfiles
1
2
Fork 0
Code Issues 142 Pull Requests Activity

home/git: don't delete main/master on delete-merged

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-10-24 11:45:00 +09:00
parent 68268ec2a0
commit 6a4337e34f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home/programs/git/default.nix
View File

@@ -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";