feat(repos): add fast-forward-only and rebase-explicit merge flags and branch-protection cross-references #446

Merged

hexajon merged 2 commits from feat/repos-merge-flags into main 2026-08-18 18:15:57 +00:00

Conversation 0 Commits 2 Files changed 10 +284 -163

hexajon commented 2026-08-17 23:14:32 +00:00

Owner

Copy link

Summary

#432: madt_repos edit and madtea repo edit gain allow_fast_forward_only_merge and allow_rebase_explicit, and the mislabeled allow_rebase_update description is corrected to its real meaning (update a PR branch by rebase). The --allow-ff-only CLI flag is renamed to --allow-rebase-update to match the field it sets. Fast-forward-only pairs with require_signed_commits, because it mints no merge commit. #431: branch protection is reachable in one hop - the madt_repos description and each tag_protect_* summary point to madt_branches_remote, and a new madt_help protection topic names its protect_* actions.

Closes #431
Closes #432

## Summary #432: `madt_repos edit` and `madtea repo edit` gain `allow_fast_forward_only_merge` and `allow_rebase_explicit`, and the mislabeled `allow_rebase_update` description is corrected to its real meaning (update a PR branch by rebase). The `--allow-ff-only` CLI flag is renamed to `--allow-rebase-update` to match the field it sets. Fast-forward-only pairs with `require_signed_commits`, because it mints no merge commit. #431: branch protection is reachable in one hop - the `madt_repos` description and each `tag_protect_*` summary point to `madt_branches_remote`, and a new `madt_help` `protection` topic names its `protect_*` actions. Closes #431 Closes #432

hexajon added 2 commits 2026-08-17 23:14:32 +00:00

feat(repos): add fast-forward-only and rebase-explicit merge flags; fix allow_rebase_update description; cross-reference branch protection (#431, #432) fdee6b3731

fix(repos): rename --allow-ff-only to --allow-rebase-update, matching the live forge field allow_rebase_update it sets c9829f8fd0

hexajon scheduled this pull request to auto merge when all checks succeed 2026-08-17 23:14:51 +00:00

hexajon force-pushed feat/repos-merge-flags from c9829f8fd0 to 1172392f4f 2026-08-18 18:11:38 +00:00 Compare

hexajon merged commit 1172392f4f into main 2026-08-18 18:15:57 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

breaking

Breaking change - flag for release notes

  

bug

Something is not working

  

documentation

Documentation only

  

enhancement

New feature

  

epic

Tracking epic with dependency children

  

good first issue

Interested in contributing? Get started here.

  

help wanted

Maintainer would welcome outside help

  

refactoring

Code restructuring without behavior changes

  

resolution/duplicate

Closed as duplicate of another issue

  

resolution/invalid

Closed as invalid or not reproducible

  

resolution/wontfix

Closed as won't fix

  

security

Security issue or hardening

  

severity/critical

Security severity: critical

  

severity/high

Security severity: high

  

severity/low

Security severity: low

  

severity/medium

Security severity: medium

  

status/abandoned

Someone started, then walked away - up for grabs

  

status/blocked

Blocked by another issue or an external dependency

  

status/needs-decision

Waiting on a maintainer decision; workable once decided

  

status/needs-info

Waiting on reporter / more information before work can start

  

status/needs-verification

Done except verification in a live interactive session

  

testing

Test suite / CI infrastructure work

  

upstream

Related to an upstream repository, already reported there

No labels

breaking

bug

documentation

enhancement

epic

good first issue

help wanted

refactoring

resolution/duplicate

resolution/invalid

resolution/wontfix

security

severity/critical

severity/high

severity/low

severity/medium

status/abandoned

status/blocked

status/needs-decision

status/needs-info

status/needs-verification

testing

upstream

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

sixfold-space/madtea!446

No description provided.