auto_rebase.pl - Automate rebasing and resolving conflicts during Git rebases.
auto_rebase.pl [options]
Options:
--git-dir Path to the Git repository (default: current directory)
--target-branch Target branch to rebase onto (default: main)
--new-branch The resulting branch (default: ${source-branch}-rebased)
-n The number of commits to pick for rebase from the source branch
--bugzilla Pull patches from bugzilla
--help Show this help message
This script automates the rebasing of a Git branch onto a target branch that contains the tidy version of the codebase. It rebases up to before the first commit of the tidy commits then applies the commits from the source branch, tidy this version and commits.
Finally the rebase will continue.
The source branch is the branch that is currently checked out.
Rebase onto 'main' in the current repository:
./auto_rebase.pl
Rebase onto 'dev' in a specified Git repository:
./auto_rebase.pl --git-dir /path/to/repo --target-branch dev
Rebase onto 'main' and produces a new branch named 'new-branch'
./auto_rebase.pl --new-branch new-branch
Rebase onto 'main' the last 42 commits of the current branch
./auto_rebase.pl -n 42
Rebase onto 'main' the patches from bugzilla's bug 42424
./auto_rebase.pl --bugzilla 42424
Jonathan Druart <jonathan.druart@bugs.koha-community.org>