How to Compare Differences Between Two Branches in Git?

Comparing differences between two branches in Git is a common requirement, commonly handled via the command line. Here are several common methods to compare branches:

1. Using the git diff Command

The git diff command is a tool for comparing differences within a Git repository, capable of comparing file differences as well as differences between branches.

Syntax:

bash
git diff <branch1>..<branch2>

Example: Consider two branches named master and feature. To compare these branches, you can use:

bash
git diff master..feature

This command outputs the differences between the two branches at the current commit point. If you only want to view differences for specific files, you can append the file path:

bash
git diff master..feature -- path/to/file

2. Using the git log Command

Beyond directly comparing file content differences, understanding the differences in commit history between two branches can be useful.

Syntax:

bash
git log <branch1>..<branch2> --oneline

Example: To view commits in the master branch that are not present in the feature branch:

bash
git log master..feature --oneline

Conversely, to view commits unique to the feature branch:

bash
git log feature..master --oneline

3. Using Graphical Tools

In addition to command-line tools, various graphical Git clients can assist in comparing branches, such as GitKraken, SourceTree, and GitHub Desktop. These tools provide a more intuitive interface for viewing branch differences.

Conclusion

Comparing two branches helps developers understand changes between different branches, verify the state before merging, and track the development progress of specific branches. Depending on the requirements, you can choose between command-line tools or graphical tools to accomplish this task. In my work, I frequently use these methods to ensure the correctness of code merges and accurately monitor the multi-branch development status of the project.