Git: شرح مفصل لمرحلة التجهيز في Git وتعدد المهام

# View Current Changes
git status

# Output：
# Changes not staged for commit:
#   modified:   src/auth.js
#   modified:   src/user.js

# Save current changes temporarily
git stash

# Output：
# Saved working directory and index state WIP on main: a1b2c3d feat: Add Feature

# View Status（The workspace is clean）
git status

# Output：
# On branch main
# nothing to commit, working tree clean

# Save for now and add a description
git stash save "WIP: User Login Feature"

# Or usepush（New Grammar）
git stash push -m "WIP: User Login Feature"

# Output：
# Saved working directory and index state On main: WIP: User Login Feature

# View the staging list
git stash list

# Output：
# stash@{0}: On main: WIP: User Login Feature

# Create a New File（Not tracked）
touch new-file.js

# DefaultstashUntracked files will not be saved
git stash

# Output：
# Saved working directory and index state WIP on main: a1b2c3d
# new-file.js still untracked

# Usage-uThe selection includes untracked files
git stash -u

# Or
git stash --include-untracked

# Usage-aThe option includes all files（Include ignored files）
git stash -a

# View the staging list
git stash list

# Output：
# stash@{0}: On main: WIP: User Login Feature
# stash@{1}: On feature: WIP: Shopping Cart Feature
# stash@{2}: On develop: FixBug

# Limit the number of items displayed
git stash list -3

# View Staging Details
git stash show

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

# View Detailed Differences
git stash show -p

# View a Specific Cache
git stash show stash@{1}

# View the latest full diff from the staging area
git stash show -p stash@{0}

# Output：
# diff --git a/src/auth.js b/src/auth.js
# index abc1234..def5678 100644
# --- a/src/auth.js
# +++ b/src/auth.js
# @@ -10,6 +10,16 @@ function validate() {
# +  // Added validation logic
# +  if (!token) {
# +    return false;
# +  }
#    return true;
#  }

# View Cached Statistics
git stash show --stat

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

# Delete the latest staging
git stash drop

# Delete Specified Stash
git stash drop stash@{2}

# Clear All Cache
git stash clear

# Confirm Deletion
git stash list

# Apply, Save, and Delete
git stash pop

# Output：
# On branch main
# Changes not staged for commit:
#   modified:   src/auth.js
#   modified:   src/user.js

# Use Specified Stash
git stash pop stash@{1}

# If there is a conflict
# CONFLICT (content): Merge conflict in src/auth.js
# The stash entry is kept in case you need it again.

# After Resolving the Conflict，Manually Delete the Stash
git stash drop

# App is cached but not deleted
git stash apply

# Use Specified Stash
git stash apply stash@{1}

# View the staging list（The temporary file is still there）
git stash list

# Output：
# stash@{0}: On main: WIP: User Login Feature
# stash@{1}: On feature: WIP: Shopping Cart Feature

# applySuitable for multiple uses of the same temporary storage

# Only cache changes to tracked files
git stash

# Check-in includes untracked files
git stash -u

# Check out includes ignored files
git stash -a

# Temporary Workspace Only，Reserve a buffer
git stash -k

# Cache only specific files
git stash push src/auth.js

# Cache only files that match the pattern
git stash push '*.js'

# Preserve the temporary storage index
git stash --index

# Create a New Branch from a Stash
git stash branch feature-from-stash

# Output：
# Switched to a new branch 'feature-from-stash'
# On branch feature-from-stash
# Changes not staged for commit:
#   modified:   src/auth.js

# This will create a new branch and apply the staged changes.
# Ideal for transferring staged changes to a new branch for development

# Features currently under developmentA
echo "feature A code" > feature-a.js
git status

# Output：
# Untracked files:
#   feature-a.js

# Sudden need for urgent repairsBug
# Save the current work
git stash save "WIP: FeaturesAUnder development"

# Switch tohotfixBranch
git checkout -b hotfix-urgent-bug

# FixBug
echo "fix" > fix.js
git add fix.js
git commit -m "fix: Urgent FixBug"

# Push Fix
git push origin hotfix-urgent-bug

# Switch back to the original branch and resume work
git checkout main
git stash pop

# Continue Developing FeaturesA

# Development FeaturesA
echo "feature A" > feature-a.js
git stash push -m "FeaturesA"

# Toggle Development FeaturesB
git checkout -b feature-b
echo "feature B" > feature-b.js
git stash push -m "FeaturesB"

# View the staging list
git stash list

# Output：
# stash@{0}: On feature-b: FeaturesB
# stash@{1}: On main: FeaturesA

# Back tomainContinue DevelopmentA
git checkout main
git stash pop stash@{1}

# Completed FeaturesA
git add feature-a.js
git commit -m "feat: FeaturesADone"

# Cut tofeature-bContinue DevelopmentB
git checkout feature-b
git stash pop

# Staging Changes on feature Branch
git checkout feature
echo "some changes" > file.js
git stash save "Share Edits"

# Switch tomainBranch Application Staging
git checkout main
git stash apply

# NowmainThese changes are also present in the branch.
# The temporary file is still there，Can be applied to other branches

# Switch todevelopBranch Applications
git checkout develop
git stash apply

# Delete Stash
git stash drop

# Add a clear description
git stash save "WIP: User Authentication Feature，Complete the login logic"

# Clear the cache list periodically
git stash list
git stash drop stash@{5}  # Delete the old staging area

# Usageapplyrather thanpop，If you're not sure whether you still need it
git stash apply

# Check the status before saving temporarily
git status
git diff

# No description，Difficult to identify
git stash

# Retaining large amounts of temporary data over the long term
git stash list  # Dozens of temporary files

# Forgot to restore the staging area
git stash
# ... A few days later, I forgot what I had saved.

# Conflicts caused by app cache
git stash pop

# Output：
# CONFLICT (content): Merge conflict in src/auth.js
# The stash entry is kept in case you need it again.

# View Conflicting Files
git status

# Resolving Conflicts
# Editing Files with Conflicts，Keep the necessary content

# Mark the conflict as resolved
git add src/auth.js

# Delete Stash
git stash drop

# Or discard the temporary file
git reset --hard
git stash drop

#!/bin/bash
# stash-manager.sh - Cache Management Tool

case "$1" in
    list)
        echo "=== Stash List ==="
        git stash list
        ;;
    show)
        if [ -z "$2" ]; then
            git stash show -p
        else
            git stash show -p "stash@{$2}"
        fi
        ;;
    apply)
        if [ -z "$2" ]; then
            git stash apply
        else
            git stash apply "stash@{$2}"
        fi
        ;;
    drop)
        if [ -z "$2" ]; then
            git stash drop
        else
            git stash drop "stash@{$2}"
        fi
        ;;
    clear)
        read -p "Clear all stashes? (y/n) " -n 1 -r
        echo
        if [[ $REPLY =~ ^[Yy]$ ]]; then
            git stash clear
            echo "All stashes cleared"
        fi
        ;;
    *)
        echo "Usage: $0 {list|show [n]|apply [n]|drop [n]|clear}"
        ;;
esac