The obvious-but-wrong git merge-base branch1 branch2 branch3 will give you a commit, but, as described in the Discussion section in the docs, it isn't necessarily a common ancestor of all three branches.

May 20, 2015 · git merge-base finds best common ancestor(s) 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 ...

Sep 15, 2020 · The reason this works is that every ancestor of a common ancestor is a common ancestor (by definition). So once git merge-base finds a Lowest Common Ancestor—or with --all, finds all of them, as there may be more than one—every commit reachable from here back to each root commit is also a common ancestor. The root ones are almost certainly ...

A does not qualify because, while A is an ancestor of the three ancestors of Z itself, it is not an ancestor of G, while G is an ancestor of Z. The way to find X is to do a topologically sorted priority-queue walk of the commit graph, starting from all parents of Z in this case, just as git log or git rev-list would do given --topo-order Z^@ .

Dec 18, 2017 · 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.

Dec 15, 2014 · For example if there was such a thing as master#topic1 (same as topic1#master) that meant, "the most recent commit shared by both master and topic." I would like to be able to: $ git checkout topic1 $ git diff master#topic1..topic1. I know that I can do: git diff master..topic. but I don't care about commits c and d.

Sep 10, 2016 · Find common ancestor of two git branches - this question explains how to show a common ancestor for two branches. git merge-base branch1 branch2 However, I want to see a common ancestor of three or more branches. At first, I thought this would work. git merge-base branch1 branch2 branch3 branch4

May 1, 2017 · I usually need to find the ancestor between the tip of my branch, HEAD and the remote main development branch, say origin/dev. Here is what I use : git log --reverse --boundary --format=%h HEAD ^origin/dev | head -1 It essentially says: Take all the ancestors except the ones common with origin/dev; Include the boundary (the forking point)

Nov 19, 2012 · I want to find the most recent commit that's included in another branch; given the history A-B-C---E <-master └-F---G <-develop └-H-I <-branch1 I want to find F. Note that I only know the starting point branch1, and not the names of the other branches.

Nov 18, 2015 · Python: recursion in finding common ancestor in binary search tree Load 7 more related questions Show fewer related questions 0