LinuxCommandLibrary

git-merge-base

Find common ancestor commits

TLDR

Find common ancestor

$ git merge-base [branch1] [branch2]
copy
Find fork point
$ git merge-base --fork-point [branch]
copy
Check if commit is ancestor
$ git merge-base --is-ancestor [commit1] [commit2]
copy
Find octopus merge base
$ git merge-base --octopus [branch1] [branch2] [branch3]
copy

SYNOPSIS

git merge-base [options] commit...

DESCRIPTION

git merge-base finds the best common ancestor(s) for a merge. The result is the most recent commit reachable from all specified commits, serving as the base for three-way merge operations.
The `--fork-point` option finds where a branch diverged from an upstream branch, accounting for history rewrites. The `--is-ancestor` option checks if one commit is an ancestor of another, which is useful in scripts for determining commit relationships. For octopus merges (merging more than two branches), the `--octopus` option computes a common base for multiple commits simultaneously.

PARAMETERS

--fork-point

Find fork point.
--is-ancestor
Check ancestry.
--octopus
Find octopus merge base.
-a, --all
Output all merge bases.

SEE ALSO

> TERMINAL_GEAR

Curated for the Linux community

Copied to clipboard

> TERMINAL_GEAR

Curated for the Linux community