From 2ecab555b962a8c02c7b6d0f3400a75fdd71afb5 Mon Sep 17 00:00:00 2001 From: Amolith Date: Wed, 12 Nov 2025 16:12:05 -0700 Subject: [PATCH] chore(crush): simplify commit command --- dot_config/crush/commands/commit.md | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dot_config/crush/commands/commit.md b/dot_config/crush/commands/commit.md index 336215096dfffbe74faf9eae0b8f5257410b099c..e8e138612b6f1ae572705e35258b4a7469f63b0c 100644 --- a/dot_config/crush/commands/commit.md +++ b/dot_config/crush/commands/commit.md @@ -1,23 +1,16 @@ Please do the following. - Always follow Conventional Commits. -- Only stage files you've directly changed during this conversation. - Trailer references - - Issue/bug trailer options - - Fixes: - - Implements: - - References: - - Closes: - - Include yourself in the `Assisted-by` trailer. - - _Always_ look for a number in the branch name, like `3-new-feature` or `user/fix-thing_36`. Only if there is, + - Look for a number in the branch name, like `3-new-feature` or `user/fix-thing_36`. Only if there is, - Run `git remote -v` and notice whether any of the remotes include 'soprani.ca', 'sopranica', 'singpolyma', or 'sgx-XXX' where XXX is an arbitrary string (for example, sgx-jmp, sgx-bwmsgsv2, sgx-endstream, etc.). If any of those keywords are found, run `hut todo -t '~singpolyma/soprani.ca' ticket show NUMBER-FROM-BRANCH-NAME` to see the ticket we're working on and surrounding discussion. - Depending on commit contents and bug contents, ask me which trailer to use. Format the trailer value like `https://todo.sr.ht/~singpolyma/soprani.ca/TICKET_NUM`. If there is no number in the branch name or the remotes don't contain any of the keywords, _do not_ include a trailer. - - _Always_ look for a short hash in the branch name, like `40cd4d1-sort-branches-by-updatedat` or `user/9ebc998_pin-default-branch` or `horizontal-navbar-on-mobile/6016e27` and so on. Only if there is, + - Look for a short hash in the branch name, like `40cd4d1-sort-branches-by-updatedat` or `user/9ebc998_pin-default-branch` or `horizontal-navbar-on-mobile/6016e27` and so on. Only if there is, - Run `git-bug bug show HASH` to see the bug we're working on and surrounding discussion. - Depending on commit contents and bug contents, ask me which trailer to use. Format the trailer value like `bug-HASH`. If there is no hash in the branch name, _do not_ include a trailer. - _After_ creating the commit, ask whether to close the bug. If I say yes, close it with `git-bug bug status close HASH`. -- Check whether there are already staged changes. +- Check whether there are already staged changes. Do NOT read entire diffs or files until you're sure which are relevant to the commit. - If no, look at the `git status`, then look at our conversation above. - If you do _not_ notice View/Edit-related activity for the files/dirs referenced in the `git status` output, STOP and ask me which changes you should stage, analyse, then commit. Present the changes as per-file bullets with summaries. - If you _do_ notice View/Edit activity for the changed files, `git add` them, then STOP and ask me whether to stage any of the other files. Present the changes as per-file bullets with summaries. - - If yes, analyse the changes and craft your commit message. + - If yes, analyse the changes, craft your commit message, and make the commit.