pwntester / octo.nvim

Edit and review GitHub issues and pull requests from the comfort of your favorite editor
MIT License
2.24k stars 124 forks source link

feat: Add default merge method #489

Closed ricoberger closed 5 months ago

ricoberger commented 5 months ago

Describe what this PR does / why we need it

This commit adds a new option default_merge_method, which can be used to define the default merge method for the Octo pr merge command.

Until now the Octo pr merge was always using commit when no argument was defined. This can now be customized by the user. A user can select between commit, rebase and squash. If another string is provided it will fallback to commit.

This is especially useful (at least for me 😅) when the enable_builtin option is enabled and the merge command is selected via Telescope where it isn't possible to provide the merge method.

Does this pull request fix one issue?

NONE

Special notes for reviews

pwntester commented 5 months ago

Looks great, thanks for the contribution!