Module branchless::core::rewrite

Tools for editing the commit graph.

Modules

rewrite_hooks

Hooks used to have Git call back into git-branchless for various functionality.

Structs

BuildRebasePlanOptions

Options used to build a rebase plan.

ExecuteRebasePlanOptions

Options to use when executing a RebasePlan.

MergeConflictInfo

Information about a merge conflict that occurred while moving commits.

RebasePlan

Represents a sequence of commands that can be executed to carry out a rebase operation.

RebasePlanBuilder

Builder for a rebase plan. Unlike regular Git rebases, a git-branchless rebase plan can move multiple unrelated subtrees to unrelated destinations.

RebasePlanPermissions

A token representing that the rebase plan has been checked for validity.

RepoResource

A thread-safe Repo resource pool.

Enums

BuildRebasePlanError

An error caused when attempting to build a rebase plan.

ExecuteRebasePlanResult

The result of executing a rebase plan.

MergeConflictRemediation

What to suggest that the user do in order to resolve a merge conflict.

Functions

execute_rebase_plan

Execute the provided rebase plan. Returns the exit status (zero indicates success).

find_abandoned_children

Find commits which have been “abandoned” in the commit graph.

find_rewrite_target

For a rewritten commit, find the newest version of the commit.

move_branches

Given a list of rewritten OIDs, move the branches attached to those OIDs from their old commits to their new commits. Invoke the reference-transaction hook when done.

Type Definitions

RepoPool

Type synonym for ResourcePool<RepoResource>.