diff --git a/modules/common/shell/git.nix b/modules/common/shell/git.nix index ecd595f..411d617 100644 --- a/modules/common/shell/git.nix +++ b/modules/common/shell/git.nix @@ -113,6 +113,7 @@ in gpd = "git push origin -d"; gbd = "git branch -d"; gbD = "git branch -D"; + gdd = "git-delete-both"; gr = "git reset"; grh = "git reset --hard"; gm = "git merge"; @@ -158,6 +159,13 @@ in and git branch -D $branch ''; }; + git-delete-both = { + argumentNames = "branch"; + body = '' + git push origin -d $branch + git branch -d $branch + ''; + }; git-merge-fuzzy = { body = '' set branch (git-fuzzy-branch "merge from...")