projects / maintainer-tools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fe709c1) | patch
github-merge-pr: add support for merging PR that can't be rebased
authorChristian Marangi <ansuelsmth@gmail.com>
Thu, 5 Oct 2023 10:33:40 +0000 (12:33 +0200)
committerChristian Marangi <ansuelsmth@gmail.com>
Thu, 5 Oct 2023 10:33:40 +0000 (12:33 +0200)
commit87ad03d80b002cce754efd1789859dfb18fa7f50
treea5d4d13833ae94e2129a7570fd959c593b4c365atree | snapshot
parentfe709c1d4b5696729d66ea224f0c3494d2a0e98ccommit | diff
github-merge-pr: add support for merging PR that can't be rebased

Add support for merging PR that can't be rebased if the user didn't
permit force push by maintainers. The script will fetch the remote
origin and try to merge with --ff-only without rebasing.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
github-merge-pr.sh diff | blob | history
Maintainer scripts for OpenWrt