Git - 比较两个分支

To find the common commits between two Git branches, you can use the git merge-base command to identify the most recent common ancestor.

To see all common commits, you can use a specific git log command with the merge base as the starting point.

Find the most recent common ancestor

This is the simplest way to find the single latest common commit. It tells you where the two branches diverged from each other.

Run the following command, replacing branch1 and branch2 with the names of your branches:

git merge-base branch1 branch2

The output is the SHA-1 hash of the merge base commit. You can then use this hash to inspect the details of that specific commit.

For example, to see the commit details, use:

git log <commit_hash>

Show all common commits

To view the history of all commits that both branches share, you can use git log with the merge base commit.

First, find the merge base as shown above and store it in a variable.

MERGE_BASE=$(git merge-base branch1 branch2)

Next, run git log starting from the merge base commit. This command will show the history from that point, which is common to both branches.

git log $MERGE_BASE

For a more concise, graphical view, add the --oneline and --graph options.

git log --oneline --graph $MERGE_BASE

This command is useful for visualizing the shared history before the branches diverged.

Compare commits exclusive to each branch

While not explicitly showing common commits, comparing the commits unique to each branch is often what developers are actually looking for.

Use the git log command with the double-dot (..) syntax to show commits that are on one branch but not the other.

• To see commits on branch2 but not branch1:

git log branch1..branch2

• To see commits on branch1 but not branch2:

git log branch2..branch1