# 下載地址：https://git-scm.com/download/win
# 安裝時(shí)建議勾選"Git Bash Here"和"Enable symbolic links"

git config --global user.name "YourName"
git config --global user.email "your@email.com"
git config --global core.autocrlf input  # 處理?yè)Q行符
git config --global core.editor "code --wait"  # 使用VSCode作為默認(rèn)編輯器

mkdir git-demo && cd git-demo
git init  # 初始化倉(cāng)庫(kù)
echo "# Git實(shí)戰(zhàn)項(xiàng)目" > README.md

# calculator.py
def add(a, b):
    """加法函數(shù)"""
    return a + b

# 測(cè)試用例
if __name__ == "__main__":
    print(add(2, 3))  # 注意這里有語(yǔ)法錯(cuò)誤，后面演示修復(fù)

git add calculator.py  # 跟蹤單個(gè)文件
git add .             # 添加所有新文件和修改
git status            # 查看當(dāng)前狀態(tài)

git commit -m "feat: 實(shí)現(xiàn)基礎(chǔ)加法函數(shù)"
git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit

git checkout -b feature/subtract  # 創(chuàng)建并切換分支

# calculator.py 新增
def subtract(a, b):
    """減法函數(shù)"""
    return a - b

git commit -am "feat: 添加減法功能"  # -a參數(shù)自動(dòng)add已跟蹤文件

git checkout main
git merge feature/subtract  # 快速向前合并

# 模擬沖突
# 在兩個(gè)不同分支修改同一行代碼后...
git merge feature/divide
"""
Auto-merging calculator.py
CONFLICT (content): Merge conflict in calculator.py
"""

git add calculator.py
git commit -m "fix: 解決合并沖突"

git remote add origin https://gitee.com/yourname/git-demo.git
git push -u origin main  # 首次推送設(shè)置上游分支

# 推薦工作流程
git checkout -b feature/new-feature  # 新功能開發(fā)
git push origin feature/new-feature  # 推送功能分支
# 在代碼平臺(tái)發(fā)起Pull Request

git commit --amend  # 修改最近提交
git rebase -i HEAD~3  # 交互式變基

git stash  # 暫存當(dāng)前修改
git checkout -b hotfix/urgent
# 進(jìn)行修復(fù)...
git commit -m "fix: 緊急修復(fù)登錄問(wèn)題"
git checkout main
git merge hotfix/urgent
git stash pop  # 恢復(fù)暫存修改

# ~/.gitconfig
[alias]
    lol = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
    st = status -sb
    co = checkout
[core]
    excludesfile = ~/.gitignore_global  # 全局忽略文件

feat: 添加用戶注冊(cè)功能
fix: 修復(fù)登錄驗(yàn)證漏洞
docs: 更新API文檔
chore: 更新依賴版本
refactor: 重構(gòu)支付模塊

git filter-branch --tree-filter 'rm -f bigfile.zip' HEAD
git push origin --force

git reset --soft HEAD~1  # 撤銷提交但保留修改
git checkout -- file.txt  # 丟棄工作區(qū)修改

git reflog  # 查找刪除前的commit hash
git checkout -b recovered-branch <commit_hash>

# 操作系統(tǒng)文件
.DS_Store
Thumbs.db

# 開發(fā)環(huán)境
.env
node_modules/
dist/

# IDE
.vscode/
.idea/

# 編譯文件
*.class
*.exe
*.dll