feat: add gh rebase merge dependabot local

aps831 · Feb 1, 2024 · ffcdd7d · ffcdd7d
1 parent 4e12dea
commit ffcdd7d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/dot_config/gh/private_config.yml b/dot_config/gh/private_config.yml
@@ -13,6 +13,7 @@ aliases:
     pr-combine-dependabot-combine: 'combine-prs --query "author:app/dependabot -label:no_combine_prs" --skip-pr-check'
     pr-rebase-dependabot-remote: '!id="$(gh pr list --search "author:app/dependabot" | fzf | cut -f1)"; [ -n "$id" ] && gh pr comment "$id" -b "@dependabot rebase"'
     pr-rebase-merge-dependabot-remote: '!id="$(gh pr list --search "author:app/dependabot" | fzf | cut -f1)"; [ -n "$id" ] && gh pr merge "$id" --rebase'
+    pr-rebase-merge-dependabot-local: '!pr_branch="$(gh pr list --search "author:app/dependabot" | fzf | cut -f3)"; [ -n "$pr_branch" ] && remote=$(git remote -v | grep github.com | head -n 1 | awk ''{print $1}'') && git fetch $remote $pr_branch:$pr_branch && current_branch=$(git rev-parse --abbrev-ref HEAD) && git rebase $current_branch $pr_branch && git checkout $current_branch && git merge $pr_branch'
     pr-list-dependabot: 'pr list --author app/dependabot'
     pr-list-dependabot-combine: 'pr list --search "author:app/dependabot -label:no_combine_prs"'
     pr-list-dependabot-no-combine: 'pr list --search "author:app/dependabot label:no_combine_prs"'