How to use diff with Git?

Using diff with Git is essential for reviewing changes in your code before committing them. Here’s how you can effectively use diff in a Git context:

1. Viewing Changes in Your Working Directory

To see the changes you've made in your working directory compared to the last commit, use:

git diff

This command shows you the differences between your current files and the last committed version. It will display the changes in a format similar to the standard diff output, highlighting additions and deletions.

2. Comparing Staged Changes

If you want to see what changes you have staged for the next commit (i.e., changes added with git add), use:

git diff --cached

This command compares the staged changes against the last commit, allowing you to review what will be included in your next commit.

3. Comparing Two Commits

To compare the differences between two specific commits, you can use:

git diff commit1 commit2

Replace commit1 and commit2 with the actual commit hashes or references (like branch names). This will show you the changes that occurred between those two commits.

4. Using External Diff Tools

If you prefer a visual representation of your changes, you can configure Git to use an external diff tool. For example, to set up vimdiff, run:

git config --global diff.tool vimdiff
git config --global difftool.prompt false

Then, you can use:

git difftool

This command will open the changes in vimdiff, allowing you to navigate through the differences visually.

Example Workflow

Make changes to your files.
Check what has changed since the last commit:
```
git diff
```
Stage your changes:
```
git add .
```
Review staged changes:
```
git diff --cached
```
Commit your changes:
```
git commit -m "Your commit message"
```

Further Learning

To enhance your skills with Git and diff, consider exploring:

Git Branching: Understand how to manage different lines of development.
Git Rebase and Merge: Learn how to integrate changes from different branches.

Feel free to ask if you have more questions or need further clarification!