Claude Code Git ワークフロー完全ガイド｜コミットメッセージ自動生成・PR作成・コンフリクト解消・git log調査の実践パターン

# 変更をステージングしてから /commit を実行
git add src/auth/login.ts tests/auth/login.test.ts
/commit
# Claude が差分を分析してメッセージを生成し、確認後にコミット実行

# または自然言語で依頼
claude "stage the changes in src/auth/ and create a commit"

# 規約を明示してメッセージを生成させる
claude "review the staged changes and write a commit message following these rules:
- Use Conventional Commits format (type(scope): description)
- Type must be one of: feat, fix, refactor, test, docs, chore
- Scope is the affected module name
- Description in Japanese
- Body should explain WHY not WHAT
Then commit"

# 全変更をClaudeに見せてコミット分割を提案させる
git diff | claude "Review these changes and suggest how to split them into
logical commits. For each proposed commit, list the files it should include
and write a Conventional Commits message."

# 基本のPR作成
claude "create a pull request for this branch"

# テンプレートを指定してPR作成
claude "create a pull request with:
- Title summarizing the feature
- Description including: what changed, why, how to test
- List of affected files
- Any breaking changes or migration steps needed"

# UIの変更を含むPRでスクリーンショットを自動添付
claude "start the dev server, take screenshots of the before/after states
of the navbar component, then create a PR with those screenshots embedded
in the description"

# PR番号を指定してセッション再開
claude --from-pr 123

# PR URLを指定
claude --from-pr https://github.com/org/repo/pull/123

# セッション再開後は、レビューコメントの対応を依頼できる
claude "address all the review comments on this PR"

# コンフリクトが発生したままコミットせずにClaudeに渡す
git merge feature/new-auth
# Auto-merging src/auth/session.ts
# CONFLICT (content): Merge conflict in src/auth/session.ts

claude "resolve the merge conflict in src/auth/session.ts.
The goal of this branch is to add JWT refresh token support.
The main branch changes updated the session timeout logic.
Both changes should be preserved."

# コンフリクトのあるファイルを確認してから一括依頼
git diff --name-only --diff-filter=U

claude "resolve all merge conflicts. This branch adds multi-factor authentication.
The main branch fixed several security vulnerabilities.
Preserve both sets of changes. After resolving, run npm test."

# グローバル設定（推奨）
git config --global merge.conflictstyle diff3

# 設定後のコンフリクト表示例:
# <<<<<<< HEAD
# function authenticate(user) { ... }  ← 現在のブランチ
# ||||||| merged common ancestor
# function auth(user) { ... }          ← 共通の祖先
# =======
# function authenticate(user, mfa) { ... }  ← マージするブランチ
# >>>>>>> feature/mfa

# 特定のクラス・関数の変更経緯を調査
claude "look through ExecutionFactory's git history and summarize:
- How the API has evolved over time
- Why major design decisions were made (look at commit messages and PR descriptions)
- Any patterns in what types of changes are common"

# 特定の行がいつ・なぜ追加されたか調査
claude "check the git blame for line 142 in src/auth/token.ts and investigate
why the 30-minute expiry was changed to 15 minutes. Look at the commit and
any linked issue/PR."

# 特定の症状がいつから発生し始めたか調査
claude "the login timeout bug was reported last week. Use git log to find
commits that touched src/auth/ in the past 2 weeks. Check each suspicious
commit's diff to identify which change could have introduced this behavior."

# git bisect的な調査をClaudeに依頼
claude "run git log --oneline --graph --since='2 weeks ago' -- src/auth/
and identify commits most likely to have caused a session timeout regression.
List them in order of suspicion with reasons."

# 変更頻度の高いファイルを特定（バグが多い可能性が高い）
claude "run git log and identify the top 10 most frequently changed files
in the past 6 months. List them with change count and likely reasons."

# 特定の機能エリアのコントリビューター一覧
claude "who has worked on src/payments/ in the past year?
Summarize each person's main contributions."

# 特定のコミットをcherry-pick
claude "cherry-pick commit abc1234 from the release branch into main.
If there are conflicts, resolve them by keeping the main branch logic
but incorporating the bug fix from the cherry-picked commit."

# 複数コミットをcherry-pick
claude "cherry-pick the commits related to the CSV export fix from
feature/csv-export into the hotfix branch. Run tests after each cherry-pick."

# コミット履歴を整理してPRをクリーンにする
claude "clean up the last 6 commits on this branch before I create a PR:
- squash the 3 'fix typo' commits into the commit they're fixing
- reword any vague commit messages to be more descriptive
- keep the order logical (feat first, then tests, then docs)"

# fixupコミットを自動的に整理
claude "I have several 'fixup' commits that should be squashed into
their parent commits. Use interactive rebase to clean up the history."

## Git Workflow

### Branch naming
- Features: `feat/<short-description>` (e.g., feat/user-auth)
- Bug fixes: `fix/<issue-number>-<short-description>` (e.g., fix/123-login-timeout)
- Hotfixes: `hotfix/<short-description>`
- Never push directly to `main` or `develop`

### Commit messages
Follow Conventional Commits format:
- `feat(scope): description` — new feature
- `fix(scope): description` — bug fix
- `refactor(scope): description` — code change without behavior change
- `test(scope): description` — test changes
- `docs(scope): description` — documentation only
- Description in Japanese
- Body: explain WHY, not WHAT

### PR rules
- PR title must match the commit message format
- All tests must pass before requesting review
- Include screenshots for UI changes
- Reference the related issue number (Closes #123)

{
  "permissions": {
    "deny": [
      "Bash(git push * main *)",
      "Bash(git push * develop *)",
      "Bash(git push --force *)",
      "Bash(git reset --hard *)"
    ],
    "ask": [
      "Bash(git push *)"
    ]
  }
}

# 1. ブランチ作成
claude "create a new branch for adding Google OAuth login"
# → feat/google-oauth-login を自動作成

# 2. 実装（コード変更）
# ...

# 3. コミット
claude "stage the auth-related changes and create a commit"

# 4. テスト実行してからPR作成
claude "run npm test, fix any failures, then create a pull request
with a description that includes the OAuth flow diagram and
instructions for setting up the test credentials"

# マージ済みのローカルブランチを確認してから削除
claude "list all local branches that have been merged into main.
Show me the list and ask for confirmation before deleting them."

# リモートで削除済みのブランチをローカルから掃除
claude "run git fetch --prune and then delete local branches that
no longer have a remote tracking branch"

# git logからリリースノートを自動生成してタグを作成
claude "generate release notes for v2.1.0 based on commits since v2.0.0.
Group changes into: New Features, Bug Fixes, Performance Improvements, Breaking Changes.
Then create an annotated git tag v2.1.0 with these notes."