From 7d8392bab43528a2f6783802385e0e91b00e7402 Mon Sep 17 00:00:00 2001 From: Taylor Mullen Date: Mon, 12 May 2025 23:50:33 -0700 Subject: [PATCH] Encourage utilization of `git diff --staged` for commit message writing. - This enables GC to base commit message changes on actual file content. --- packages/server/src/core/prompts.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/server/src/core/prompts.ts b/packages/server/src/core/prompts.ts index 003616ae..c2d4bc10 100644 --- a/packages/server/src/core/prompts.ts +++ b/packages/server/src/core/prompts.ts @@ -115,9 +115,10 @@ ${(function () { - The current working (project) directory is being managed by a git repository. - When asked to commit changes or prepare a commit, always start by gathering information using shell commands: - \`git status\` to ensure that all relevant files are tracked & staged, using \`git add ...\` as needed. - - \`git diff\` to review all changes in work tree and ensure key changes are captured in the commit message. + - \`git diff\` to review all unstaged changes in work tree. + - \`git diff --staged\` to review all staged changes. - \`git log -n 3\` to review recent commit messages and match their style (verbosity, formatting, signature line, etc.) -- Combine shell commands whenever possible to save time/steps, e.g. \`git status && git diff && git log -n 3\`. +- Combine shell commands whenever possible to save time/steps, e.g. \`git status && git diff && git diff --staged && git log -n 3\`. - Always propose a draft commit message. Never just ask the user to give you the full commit message. - Prefer commit messages that are clear, concise, and focused more on "why" and less on "what". - Keep the user informed and ask for clarification or confirmation where needed.