diff --git a/git-guide.md b/git-guide.md index 10dbb65..f9373ce 100644 --- a/git-guide.md +++ b/git-guide.md @@ -10,9 +10,16 @@ This file records repo-specific git workflow preferences for `/home/aw/code/cds` - If the user asks for a git commit description, draft the proposed commit message first. - After the proposed commit message, show the exact `git commit` command that would be used. - After the `git commit` command, show the exact `git push -u origin main` command that would be used. +- If the user asks for a git commit, do not commit immediately. +- First show both: + - the proposed commit description/message + - the exact `git commit` command planned for execution - Do not run `git commit` immediately after drafting the message. - Do not run `git push` immediately after drafting the message. - Wait for explicit user approval before creating the commit or running the push command. +- Do not treat a request such as "give me the git commit" or "make the commit" as approval by itself. +- Only execute `git commit` after the user explicitly approves the displayed commit command. +- If the user changes the requested commit message or scope after commands are shown, rebuild the proposal and wait for fresh approval. ## Push Requests - When the user asks to push, use `git push -u origin main` by default unless the user explicitly asks for a different remote or branch.