Merge pull request #291 from himkt/git-remove-merged

misc(git): define remove-merged-branches directly in config
himkt · Jan 2, 2025 · 598c25b · 598c25b
2 parents f0f7f26 + 0103b94
commit 598c25b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/bin/remove-merged-branches b/bin/remove-merged-branches
diff --git a/git/config.d/config b/git/config.d/config
@@ -6,7 +6,19 @@
 	rebase = false
 
 [alias]
-	remove-merged = !remove-merged-branches
+  remove-merged = "!f() { \
+    if [ -n \"$1\" ]; then \
+      BRANCH=\"$1\"; \
+    else \
+      BRANCH=$(git branch | awk '{print $NF}' | fzf --prompt '(base branch) > '); \
+    fi; \
+    if [ -z \"$BRANCH\" ]; then \
+      echo \"Select valid branch\"; \
+      exit 1; \
+    fi; \
+    echo \"Log: base branch: $BRANCH\"; \
+    git branch --merged \"$BRANCH\" | grep -v \"$BRANCH\" | xargs -r git branch -d; \
+  }; f"
 
 [format]
 	pretty = format:%C(yellow)%h %C(green)%cd %C(reset)%s %C(red)%d %C(cyan)[%an]