How do I see the commit differences between branches in git?

In Git, comparing commit differences between different branches is a common and useful task that helps you understand code changes between branches. This can be achieved using the git diff command. Below, I will detail how to use this command and some practical use cases.

1. Basic Command Usage

To view differences between two branches, the basic command format is:

bash
git diff <branch1>..<branch2>

Here, <branch1> and <branch2> are the names of the two branches you want to compare. This command will show all differences from <branch1> to <branch2>.

2. More Specific Difference Comparison

If you only want to view differences for a specific file between two branches, you can use:

bash
git diff <branch1>..<branch2> -- <file_path>

Here, <file_path> is the specific file path you want to compare.

3. Comparing with Merge Base

If you are preparing to merge one branch into another and want to see the differences before merging, you can use the three-dot syntax:

bash
git diff <branch1>...<branch2>

This command will show the changes on <branch2> branch starting from the common ancestor of <branch1> and <branch2>.

Practical Examples

Suppose we have two branches feature and main, and I want to know what code changes exist in the feature branch compared to the main branch.

First, I will run the following command:

bash
git diff main..feature

This command will display all modifications made on the feature branch since it was created from the main branch.

If I only care about a specific file, such as app.js, I can use:

bash
git diff main..feature -- app.js

This will only show the differences in the app.js file between these two branches.

By using these commands, I can clearly understand the code changes between different branches to make better decisions, such as whether to merge branches.

This is the basic method for using Git to compare commit differences between branches. Hope this helps you make informed decisions!