Git: مقارنة Git Diff وتحليل التغييرات

git diff [options] [<commit>] [--] [<path>...]

# Edit File
echo "new line" >> README.md

# View Workspace Changes（Relative to the temporary storage area）
git diff

# Output：
# diff --git a/README.md b/README.md
# index abc1234..def5678 100644
# --- a/README.md
# +++ b/README.md
# @@ -1,3 +1,4 @@
#  # My Project
#  
#  ## Features
# +new line

# View a Specific File
git diff README.md

# View Multiple Files
git diff file1.js file2.js

# Add or modify to the staging area
git add README.md

# View changes in the staging area（Compared to the latest submission）
git diff --staged

# Or use the old syntax
git diff --cached

# Output：
# diff --git a/README.md b/README.md
# index abc1234..def5678 100644
# --- a/README.md
# +++ b/README.md
# @@ -1,3 +1,4 @@
#  # My Project
#  
#  ## Features
# +new line

# View the workspace relative toHEADthe differences
git diff HEAD

# View the differences between the workspace and a specific commit
git diff a1b2c3d

# View the differences in the workspace compared to the last commit
git diff HEAD^

# The output includes all changes, both staged and unstaged.

git diff

# Output Format Description：
# diff --git a/file.js b/file.js     <- GitDifferential Head
# index abc1234..def5678 100644      <- File Mode
# --- a/file.js                      <- Original Document（-Indicates deletion）
# +++ b/file.js                      <- New Document（+Indicates addition）
# @@ -1,3 +1,4 @@                     <- Change Location (hunk header)
#  # My Project                      <- Context Line（Starts with a space）
#  
#  ## Features                       <- Context Line
# +new line                          <- Add a row（+Introduction）
# -old line                          <- Delete Row（-Introduction）

@@ -10,5 +10,7 @@ function login() {

# Display Statistics
git diff --stat

# Output：
#  README.md | 1 +
#  file1.js  | 5 ++---
#  file2.js  | 3 +++
#  3 files changed, 5 insertions(+), 3 deletions(-)

# Show brief statistics
git diff --shortstat

# Output：
# 3 files changed, 5 insertions(+), 3 deletions(-)

# Display Numerical Statistics
git diff --numstat

# Output：
# 1       0       README.md
# 2       3       file1.js
# 3       0       file2.js

# Compare the two commits
git diff a1b2c3d d4e5f6g

# Compare a commit to the current workspace
git diff a1b2c3d

# Compare a commit to the staging area
git diff --staged a1b2c3d

# Compare Adjacent Commits
git diff HEAD^ HEAD

# View the changes introduced by a specific commit
git show a1b2c3d

# Equivalent to
git diff a1b2c3d^ a1b2c3d

# Compare Two Branches
git diff main feature

# ViewfeatureBranch relative tomainChanges to
git diff main...feature

# ViewmainBranch relative tofeatureChanges to
git diff feature...main

# Compare a specific file across branches
git diff main feature -- file.js

# View changes made after the branch was forked
git diff $(git merge-base main feature) feature

# Compare the Two Versions
git diff v1.0.0 v2.0.0

# View the changes in a specific version
git diff v1.0.0 HEAD

# View the release notes
git diff v1.0.0 v2.0.0 --stat

# Output：
#  src/auth.js   | 25 +++++++++++++++++++++++++
#  src/user.js   | 10 +++++-----
#  package.json  |  2 +-
#  3 files changed, 32 insertions(+), 5 deletions(-)

# Show only the names of modified files
git diff --name-only

# Output：
# README.md
# file1.js
# file2.js

# Display File Modification Status
git diff --name-status

# Output：
# M  README.md     <- Edit
# A  file1.js      <- New
# D  file2.js      <- Delete
# R  old.js new.js <- Rename

# Ignore differences in whitespace characters
git diff -w

# Ignore all spaces
git diff -w --ignore-blank-lines

# Show differences at the word level
git diff --word-diff

# Highlight in color
git diff --color-words

# Reduce the number of context lines
git diff -U1

# The output displays only1Line Context：
# @@ -10,3 +10,4 @@ function login() {
#   const user = authenticate();
# +  if (!user) return;
#   return user;

# Do not display context
git diff -U0

# Increase the number of context lines
git diff -U10

# Compare only specific files
git diff -- file.js

# Compare only specific directories
git diff -- src/

# Exclude certain files
git diff -- . ':!*.test.js'

# Compare only a specific type of file
git diff -- '*.js'

# 1. View Uncommitted Changes
git diff

# 2. View Staged Changes
git diff --staged

# 3. View Statistics on All Changes
git diff HEAD --stat

# 4. Submit after verifying that everything is correct
git commit -m "feat: Add a New Feature"

# View the changes in a specific commit
git show a1b2c3d

# View statistics for a specific commit
git show --stat a1b2c3d

# View the list of files modified in a specific commit
git show --name-only a1b2c3d

# Compare the differences between the two branches
git diff main...feature

# ViewPull Requestthe differences
git diff origin/main...origin/feature

# View the content to be merged
git diff main...feature

# View common ancestors up tofeatureChanges to
git diff $(git merge-base main feature) feature

# View files that may be in conflict
git diff --name-only main...feature

# View the specific details of the conflict
git diff main feature -- file.js

# View content that would be lost if you undo the action
git diff HEAD HEAD~1

# View rollback statistics
git diff HEAD HEAD~1 --stat

# View the revision history for a specific file
git diff HEAD HEAD~1 -- file.js

# Execute the rollback after confirmation
git reset --hard HEAD~1