Skip to content

Add git mr rebase command - #28

Merged
Djuuu merged 5 commits into
masterfrom
feature/git-mr-rebase
Nov 17, 2026
Merged

Djuuu merged 5 commits into
masterfrom
feature/git-mr-rebase

Conversation

@Djuuu

@Djuuu Djuuu commented Nov 17, 2026

Copy link
Copy Markdown
Owner

Summary

Adds git mr rebase [--without-pipeline] [--async] [BRANCH], which asks GitLab to rebase the MR source branch onto its target.
It then polls until the rebase finishes and reports any merge_error.

Behavior

  • Shows the MR status block, then prompts for confirmation (skipped with -y).
  • If the MR is already mergeable, it stops with "no rebase necessary" unless --force is given.
  • --without-pipeline sends skip_ci=true.
  • --async only requests the rebase and returns without polling.
  • Polling uses merge_requests/:iid?include_rebase_in_progress=true,
    tunable via GIT_MR_REBASE_POLL_INTERVAL (default 2s) and GIT_MR_REBASE_POLL_MAX (default 60 attempts).
  • When the rebased branch is the current one, it offers git pull, then git mr update.
  • Aliases: r, rb, rebase.

Rebase the merge request through the Gitlab API, then poll until completion.
Options: --without-pipeline (skip_ci), --async (do not wait).
Once the rebase completes on the current branch, offer to run git pull,
then to update the merge request description.
@Djuuu
Djuuu force-pushed the feature/git-mr-rebase branch from 47121a0 to cf2d1b9 Compare November 17, 2026 18:35
@Djuuu
Djuuu marked this pull request as ready for review November 17, 2026 18:36
@Djuuu
Djuuu merged commit 84e9f78 into master Nov 17, 2026
6 checks passed
@Djuuu
Djuuu deleted the feature/git-mr-rebase branch November 17, 2026 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant