Skip to main content

Module combined_tree_diff

Module combined_tree_diff 

Source
Expand description

combined_tree_diff API (re-exported at this path).

Structs§

CombinedDiffPath
One path in a combined diff: merge result tree vs each parent tree.
CombinedParentSide
One parent’s contribution at a combined-diff path.
CombinedTreeDiffOptions
Options for the multitree walk.

Enums§

CombinedParentStatus
Per-parent coarse status in a combined diff (A / M / D).

Functions§

combined_diff_paths_filtered
Build combined-diff paths for a merge commit’s tree against each parent’s tree.
combined_diff_paths_trees
Combined diff paths when parents are already tree OIDs (plumbing git diff --cc with N+1 trees).
combined_parent_status_char
One character per parent for raw / name-status combined output (A/M/D).
combined_raw_meta
Metadata portion of a combined raw line: ::::modes... oids... <status> (no trailing tab/path).
format_combined_raw_line
Git raw combined line (::::modes... oids... MM\tpath).
format_combined_raw_line_all_paths
Git raw combined line (::::modes... oids... MM\tpath).