How to compare files from two different branches

In Git, to compare files between two different branches, you can use the git diff command, which is powerful and helps you view detailed differences between branches. Here's how to use the git diff command to compare files between different branches:

Suppose we have two branches, namely branch1 and branch2, and we want to compare the differences of the same file in these two branches. You can use the following command:

bash
 git diff branch1..branch2 -- [file_path]

Here, [file_path] should be replaced with the path of the file you want to compare.

Another example: if you want to compare all differences between the two branches, not just a single file, you can omit the file path:

bash
 git diff branch1..branch2

This command will display all differences between the two branches.

If you want not only a summary of the differences but also the specific content changes, you can use the -p or --patch option, which will show the full diff and patch information.

bash
 git diff branch1..branch2 -- [file_path] -p

Additionally, if you want to compare files between branches but don't care about certain parts (such as whitespace changes), you can use parameters to ignore specific differences, as shown below:

bash
 git diff branch1..branch2 -- [file_path] --ignore-space-change

This command will ignore differences caused by whitespace.

Alternatively, if you don't care about content differences and just want to see which files have changed between the two branches, you can use the --name-status option:

bash
 git diff branch1..branch2 --name-status

This command will output a list of files along with their status in both branches (e.g., whether they are modified, added, or deleted).

Additionally, if you prefer a graphical interface for a more intuitive comparison of branch differences, you can use graphical Git tools such as GitKraken or SourceTree, which provide easier-to-understand diff views.

These are several methods to compare files between branches in Git. These methods are very helpful for code reviews, merge preparations, and understanding the history of code changes.