Gitoryxgit diff is your window into what has changed in your repository. This tutorial explains how to compare staged vs unstaged changes, diff between branches and commits, and how to read the unified diff format.
You've made changes across several files but you can't remember exactly what you modified. You're about to commit but you want to double-check the diff first — and you're not sure which `git diff` command to run.
git diff is your window into change. Reviewing the diff before staging or committing is one of the best habits you can build: it catches accidental changes, debug code left in, and missing files before they enter your history.
Common mistakes developers make with this:
Gitoryx: Gitoryx shows a live side-by-side diff panel as you select files or commits in the UI — no commands needed.
`git diff` compares two snapshots of your code and shows what changed. By default it compares your working directory to the staging area. Add `--staged` to compare staged changes to the last commit.
Running `git diff` with no arguments shows all changes that are not yet staged.
git diff
# Output:
# diff --git a/src/app.ts b/src/app.ts
# --- a/src/app.ts
# +++ b/src/app.ts
# @@ -10,6 +10,7 @@
# - const old = true;
# + const updated = true;Lines starting with `-` are removed; lines starting with `+` are added.
After `git add`, plain `git diff` shows nothing. Use `--staged` (or `--cached`) to see what's staged.
git diff --stagedAlways run this before committing to confirm you're committing exactly what you intended.
Limit the diff to one file to reduce noise.
git diff src/app.ts
git diff --staged src/app.tsCompare any two commits using their SHAs or relative references.
# Between two SHAs
git diff a3f2c1d 9b1e4fa
# Current commit vs three commits ago
git diff HEAD~3 HEAD
See this workflow in Gitoryx. Side-by-side diff view for every changed file
Free downloadSee all changes between a feature branch and main.
git diff main feature/login
# See only the file names that differ:
git diff main feature/login --name-onlyFor prose or long lines, a word-level diff is easier to read than a line-level diff.
git diff --word-diffAfter staging, `git diff` shows nothing. Many beginners think their changes disappeared.
Fix: Run `git diff --staged` to see what's staged. Run `git status` to see a summary of staged vs unstaged files.
`git commit -a` stages and commits in one step, bypassing your chance to review.
Fix: Run `git diff` before committing. At minimum, use `git diff --staged` if you've already staged.
The `---` and `+++` headers at the top of each hunk refer to file paths, not removed/added lines. Beginners sometimes confuse them.
Fix: Focus on the `@@ ... @@` hunks where `-` lines are deletions and `+` lines are additions.
Gitoryx — macOS, Windows & Linux`git diff` compares the working directory to the staging area. Once you've staged your changes with `git add`, the working directory and index are in sync. Use `git diff --staged` to see staged changes.
Run `git diff <branch1> <branch2>`. For example `git diff main feature/login` shows what would change if you merged the feature branch into main.
Use `git diff --name-only`. Add `--name-status` to also see whether each file was Added (A), Modified (M), or Deleted (D).
The `@@ -a,b +c,d @@` header shows the line range of the hunk. `-a,b` means starting at line `a` for `b` lines in the old file; `+c,d` is the same for the new file.
Everything in this tutorial is faster and clearer with a visual Git client. Gitoryx is free, runs natively on macOS, Windows, and Linux, and built for developers who want to move fast without breaking things.