工作区、暂存区与提交

# 查看暂存区的详细条目
git ls-files --stage

# 输出示例：
# 100644 3b18e512dba79e4c8300dd08aeb37f8e728b8dad 0   README.md
# 100644 83baae6183e5fb8b8e6c7e4e0a5c1f3d2e0a5c1f3 0   src/main.py

# 手动模拟 git add 的第一步
echo "Hello, Git" | git hash-object --stdin -w
# 输出：ce013625030ba8dba906f756967f9e9ca394464a

# 验证对象已存入
git cat-file -p ce013625030ba8dba906f756967f9e9ca394464a
# 输出：Hello, Git

# 手动模拟 git add 的第二步
git update-index --add --cacheinfo 100644 \
  ce013625030ba8dba906f756967f9e9ca394464a hello.txt

# 将暂存区写入 tree 对象
git write-tree
# 输出：d8329fc1cc938780ffdd9f94e0d364e0ea74f579

# 手动创建 commit
git commit-tree d8329fc1 -p <parent-commit-sha> -m "Initial commit"
# 输出：1a410efbd13591db07496601ebc7a059dd55cfe9

# 更新 main 分支指针
git update-ref refs/heads/main 1a410efbd13591db07496601ebc7a059dd55cfe9

# 1. 编辑文件（第一次修改）
echo "debug: true" >> config.yaml
# 此时：Modified（工作区 ≠ 暂存区）

# 2. 暂存第一次修改
git add config.yaml
# 此时：Staged（暂存区已更新，工作区 = 暂存区）

# 3. 再次编辑文件（第二次修改）
echo "port: 8080" >> config.yaml
# 此时：Staged + Modified
#   - 暂存区中是第一次修改后的版本（Staged）
#   - 工作区中是第二次修改后的版本（Modified）

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   config.yaml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   config.yaml

git status

On branch main
Your branch is up to date with 'origin/main'.

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        new file:   feature.py
        modified:   core/engine.py

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   README.md
        deleted:    old_module.py

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        notes.txt
        tmp/

# 短格式
git status -s

# 输出示例：
A  feature.py          # A = Added to index (Staged new file)
M  core/engine.py      # M = Modified in index (Staged modified)
 M README.md           # M = Modified in worktree (Modified, not staged)
D  old_module.py       # D = Deleted in worktree (Deleted, not staged)
?? notes.txt           # ?? = Untracked
!! secret.key          # !! = Ignored

# 添加单个文件
git add README.md

# 添加多个文件
git add file1.py file2.py file3.py

# 添加整个目录
git add src/

# 添加所有改动（工作区全部）
git add .

git add -p <file>

diff --git a/src/app.py b/src/app.py
index 3b18e51..83baae6 100644
--- a/src/app.py
+++ b/src/app.py
@@ -12,6 +12,10 @@ def process(data):
     validate(data)
     transform(data)
+    if config.debug:
+        log.debug(f"Processing: {data}")
+        log.debug(f"Config: {config}")
+
     return data

Stage this hunk [y,n,q,a,d,j,J,g,/,s,e,?]?

# 第一次：只暂存核心逻辑
git add -p src/core.py
git commit -m "feat: add core processing logic"

# 第二次：暂存辅助函数
git add -p src/core.py
git commit -m "feat: add helper functions for processing"

# 第三次：暂存测试代码
git add -p tests/test_core.py
git commit -m "test: add unit tests for core processing"

# 只暂存 bug 修复相关的改动
git add -p bugfix_related_file.py
git commit -m "fix: resolve critical null pointer in auth flow"

# 功能代码继续留在工作区，稍后继续开发

# Manual hunk edit mode -- see bottom for a quick guide.
@@ -12,6 +12,10 @@ def process(data):
     validate(data)
     transform(data)
+    if config.debug:            # 删除此行 → 不暂存
+        log.debug(f"Processing: {data}")  # 删除此行 → 不暂存
+        log.debug(f"Config: {config}")    # 删除此行 → 不暂存
+
     return data

# ---
# To remove '-' lines, make them ' ' lines (context).
# To remove '+' lines, delete them.
# Lines starting with # will be removed.

# 打开编辑器撰写提交消息
git commit

# 通过 -m 直接指定提交消息
git commit -m "feat: add user authentication module"

# 跳过暂存区，直接提交所有已跟踪文件的改动（相当于 git add + git commit）
git commit -a -m "fix: correct off-by-one error in loop"

# 仅提交暂存区中指定文件的改动
git commit -m "feat: update config" -- config.yaml

# 提交后发现消息写错了
git commit -m "fxi typo in auth"   # 消息有拼写错误

# 修正提交消息
git commit --amend -m "fix: correct typo in authentication module"

# 提交后发现遗漏了一个文件
git commit -m "feat: add user profile page"

# 补充遗漏的文件
git add forgotten_file.py
git commit --amend --no-edit   # --no-edit 表示不修改提交消息

<type>(<scope>): <subject>

<body>

<footer>

feat(auth): add OAuth2 login support
fix(api): handle null response from payment gateway
docs(readme): update installation instructions

feat(payment): add Stripe payment integration

Implement Stripe Checkout Session flow for handling one-time
payments. This replaces the legacy PayPal-only flow and provides
better support for international currencies.

Closes #287
BREAKING CHANGE: PaymentResponse format has changed from
{paypal_id} to {session_id, provider}

# 安装
npm install --save-dev @commitlint/cli @commitlint/config-conventional husky

# 配置 commitlint
echo "module.exports = {extends: ['@commitlint/config-conventional']}" > commitlint.config.js

# 配置 husky hook
npx husky add .husky/commit-msg 'npx --no -- commitlint --edit "$1"'

# 1. 编辑文件
vim src/app.py

# 2. 查看改动
git status
git diff                    # 工作区 vs 暂存区
git diff --cached           # 暂存区 vs HEAD（暂存后查看）

# 3. 选择性暂存
git add -p src/app.py       # 交互式选择 hunk

# 4. 审查暂存内容
git status
git diff --cached           # 确认即将提交的内容

# 5. 提交
git commit -m "feat(app): add request validation middleware"

# 6. 查看提交
git log -1 --stat
git show HEAD