util

Documentation

Index

• func MergeBase(repo *git.Repository, a, b plumbing.Hash) ([]plumbing.Hash, error)

Functions

func MergeBase

func MergeBase(repo *git.Repository, a, b plumbing.Hash) ([]plumbing.Hash, error)

mergeBase finds best common ancestors between two commits to use in a three-way merge. One common ancestor is better than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a best common ancestor, i.e. a merge base. Note that there can be more than one merge base for a pair of commits.