How to make changes visible with Git Diff

Git Diff allows you to compare changes in files, branches and commits. It spots mistakes quickly and tracks positive developments.

Many changes are made during a project and teams often move from snapshot to snapshot. This is common whether you’re working alone on a small project in Git or working in a large team with several local repositories. This leads to different branches being created and causes commits and files to accumulate. Use the Git Command Git Diff to compare two data sources totrack or check your changes effectively. This will compare two versions and show you how they differ from each other.

This makes Git Diff an important tool for daily tasks on a project. Git Status and Git Log are often used in conjunction with Git Diff. Analyzing different versions allows you to keep track of your repository and identify errors in the code. This can stop problems quickly before they escalate. The syntax of Git Diff is always the same. The command looks like this:

Adding arguments after the command shows Git which sources you want to compare.

An illustrative example is the most practical way to explain how Git Diff works. Let’s imagine you have created a new project called “new_project” and you have inserted two text documents. These documents are called first_color.txt and second_color.txt. The document first_color.txt contains the sentence “The first color is blue”. The document second_color.txt contains the sentence “The second color is red”. Nothing happens after entering Git Diff initially, as the repository does not contain any changes that could be compared yet. You must move the two documents to the staging folder using the Git Add command. You can also find this in our handy Git cheat Sheet with PDF download. The command looks like this:

Firstly, check what changes have been made and are ready for a commit with the Command Git Status. The two text documents first_color.txt and second_color.txt will be displayed.

You can make a change to the second document now. Change the statement “The second color is red” to “The second color is yellow”. This change will then be visible with Git Diff. The output will look like this:

This output is a little bit confusing, so we’ll explain what is going on in each line.

• diff --git a/second_color.txt b/second_color.txt: This shows you which input sources were compared with Git Diff. Version a is the original version, b shows the changed version.
• index: The metadata is displayed in the index line. However, this isn’t usually of interest to users.
• --- a/second_color.txt: Git Diff assigns the three minus signs as symbols to the original input source to track the changes.
• +++ b/second_color.txt: The new version gets the plus sign as symbol.
• @@ -1 +1 @@: This is the block header which summarizes the changes. The header is very short in this example, as there was only one change on one line. It states that something was changed in the first line. If you were to formulate multiple lines and replace a word on the fifth line, Git would notice it.
• Remaining lines: The remaining lines show the exact changes. The content of the original version (“-The second color is red”) is marked with a minus and the content of the changed version (“+The second color is yellow”) is marked with a plus.

You can carry out several comparisons with Git Diff. These are the most important ones are as follows:

Use this command to compare changes in the working directory with the index:

This command compares the commits in branch_1 with the commits in branch_2. The order of the two branches is taken into account by Git Diff:

This command compares the changes between two commits. You must first query the ID of each commit with Git Log to do this.