Git merge-base determines the most recent common ancestor of two branches
This article explains how we can find the most recent common ancestor commit in Git. This comes in handy when you create a branch or merge one branch into another.
Without further ado, let’s get into today’s topic.
Determine the most recent common ancestor of two branches in Git
What is the common ancestor of two branches in Git?
Take a look at the pictures below.
In the above image, we have the master branch, in which we created a feature branch and a new-feature branch. Let's get rid of the master branch and focus on feature and new-feature branches.
We can see that we created the new feature branch after the bd9172c commit. As you might have guessed, bd9172c commit is the most recent common ancestor of our feature and main branches.
So, how do we find the most recent common ancestor of these two branches?
You only need git merge-basethe command. From Git's documentation, git merge-basethe command helps us findgit merge the best common ancestor of .
However, we can enter two branches as arguments to display the most recent common ancestor of the provided branches.
grammar:
$ git merge-base <Branch 1> <Branch 2>
Let’s look at an example.
The example below shows the master and feature branches of our local repository. To find the common ancestor between the two, we will run git merge-basethe command as shown below.
$ git merge-base master feature
This command should show the commit hash of the common ancestor.
Output:
We can use the following command to get the visualization log.
$ git log --graph --oneline --all --decorate
You should get output like this:
We can see that our feature branch forked from master at commit 2dbe38d , which is consistent with what we did earlier when we rangit merge-base , which is the same commit hash we got when we ran the command earlier.
git merge-baseYou can find the nearest common ancestor commit of two branches in Git
using the command when entering the branch at hand .
Note that this command only gets the most recent common ancestor.
For reprinting, please send an email to 1244347461@qq.com for approval. After obtaining the author's consent, kindly include the source as a link.
Related Articles
Git installation and establishment of local warehouse service
Publish Date：2025/04/05 Views：89 Category：Git
-
Git is a distributed version control system: the client does not only extract the latest version of the file snapshot, but also completely mirrors the original code repository. It has the following advantages: a. Since every extraction oper
git remote operation——multiple remote repositories for one project
Publish Date：2025/04/05 Views：131 Category：Git
-
Multiple remote repositories for a git project In our git project, the command to operate the remote repository information is $ git remote # 查看当前所有的远程仓库的名称 $ git remote -v # 查看远程仓库的名称和远程仓
Git cherry pick command usage
Publish Date：2025/04/05 Views：190 Category：Git
-
git cherry-pick is a powerful command that allows us to select an arbitrary Git commit by reference and attach it to the HEAD of the current working branch. Cherry picking is the act of picking a commit from one branch and applying it to an
Comparison between Git merge and Git rebase
Publish Date：2025/04/05 Views：171 Category：Git
-
The git rebase command may seem like Git wizardry to beginners, but if used carefully, it can actually make life easier for your development team. In this article, we compare git rebase with the related git merge command and identify all th
How to fix Git error Error: src refspec master does not match any
Publish Date：2025/04/05 Views：124 Category：Git
-
When using Git, we may encounter the error "src refspace master does not match any". Here's what the error means and how to fix it. What does src refspec master does not match any Mean in Git mean? We may encounter this error when we try to
Rebase local branch when pulling changes from remote repository branch in Git
Publish Date：2025/04/05 Views：144 Category：Git
-
This article will cover the basics of rebasing your local branch when pulling changes from a remote repository branch in Git. We use the version control system Git to track changes made to files. We commit changes in a local branch in our l
Undo Git Stash
Publish Date：2025/04/04 Views：187 Category：Git
-
This article explains how to make and save changes to a repository. Git allows you to save changes locally and push them to a server when needed. In Git, we don't use the term save , but commit . We use git add , git commit , and git stash
View a list of cache entries in Git
Publish Date：2025/04/04 Views：59 Category：Git
-
We often need to pause our work and focus on something else in our development environment. Therefore, we may need to temporarily save our current work and focus on a different one. We may want to resume our original work later. git stash T
Git stores specific files
Publish Date：2025/04/04 Views：115 Category：Git
-
This article will cover storing changes to only specific files in Git. In Git, when we make some changes in our working tree, we may have some changes which may or may not be staged in our local repo. We may now wish to save these changes f
