Using the "git diff" Command

Welcome to the very first lesson of the "Advanced Git Features" course! This lesson focuses on the git diff command, a vital tool in Git that helps you navigate and understand changes in your codebase across different versions. Being able to efficiently compare these versions is crucial for maintaining a clear code history and collaborating effectively within a development team. By mastering git diff, you will enhance your ability to review changes, track modifications across versions, and seamlessly manage your projects. This lesson will guide you through using git diff to handle various states in your repository, whether it's unstaged changes, staged changes, or differences between branches and commits. Let’s dive into the details of using git diff effectively.

git diff is a command-line tool used to see the differences between various states of a git repository, particularly useful for reviewing changes before they are committed. It provides a detailed view of modifications made to your files but not yet staged for the next commit. This assists developers in identifying which lines have been added, removed, or altered since the last commit.

The basic syntax:

git diff

When executed, git diff compares the current files in your working directory with the last committed snapshot. It highlights lines that have been added, removed, or modified. Let's consider this example comparing two versions of a file example.txt:

Version 1:

Hello, World!
This is a line.
Goodbye, World!

Version 2:

Hello, Universe!
This is a line.
This is an additional line.
Farewell, World!
See you soon!

When you run git diff, the command produces a detailed output displaying the changes, typically resembling the following format:

diff --git a/example.txt b/example.txt
index 83db48f..f9c2d9a 100644
--- a/example.txt
+++ b/example.txt
@@ -1,3 +1,5 @@
-Hello, World!
+Hello, Universe!
 This is a line.
+This is an additional line.
-Farewell, World!
+Goodbye, World!
+See you soon!

Let's break down the different parts of this output:

• The diff --git a/example.txt b/example.txt line indicates the file path in the repository and shows that changes are being compared for example.txt.

• The index 83db48f..f9c2d9a line shows two unique identifiers for the content of the file before and after the changes. Think of them as checkpoints that help Git track which versions of the file are being compared.

• The 100644 part indicates the file's permissions, telling us that it's a regular file (not executable) and has standard permissions: the owner can read and write, while others can only read.

• The lines prefixed with --- and +++ indicate the file before and after changes. Specifically, --- a/example.txt represents the original file (a/ is a common convention for the "old" file in diffs), while +++ b/example.txt shows the file with modifications (b/ represents the "new" file).

• Lines starting with @@ provide the line numbers of the changes in the format @@ -<start line>,<lines count> +<start line>,<lines count> @@. For example, in our output:

  plaintext

  @@ -1,3 +1,5 @@

  This indicates that from the original file, starting from line 1, a total of 3 lines are being compared (-1,3). In the modified file, starting from line 1, a total of 5 lines are being compared (+1,5) due to the additional lines added.

• A line beginning with - shows lines removed from the file, while lines with + represent additions.

By default, git diff uses a unified format to display changes, making it easier to review before staging.