From 8cbb0cbc4569f042ae7414c83e84c87a411c386b Mon Sep 17 00:00:00 2001 From: Tom Boucher Date: Thu, 14 May 2026 19:00:38 -0400 Subject: [PATCH] fix(reapply-patches): add gsd-update arm to git-enhanced two-way merge filter (#3516) The grep -v alternation in the git-enhanced two-way merge step was missing the 'gsd-update' arm after the slash-command rename from /gsd:update to /gsd-update. Commits authored by the current update flow fell through the filter and were misclassified as user customizations, causing spurious merge prompts during /gsd-update --reapply. Adds 'gsd-update' between 'gsd:update' and 'GSD update'. The legacy 'gsd:update' arm is preserved for back-compat; 'GSD update' and 'gsd-install' exclusions are unchanged. --- get-shit-done/workflows/reapply-patches.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/get-shit-done/workflows/reapply-patches.md b/get-shit-done/workflows/reapply-patches.md index 1f5b2ce56..8dce5039e 100644 --- a/get-shit-done/workflows/reapply-patches.md +++ b/get-shit-done/workflows/reapply-patches.md @@ -228,7 +228,7 @@ d. **If ALL differences appear to be mechanical drift → still flag as CONFLICT When the config directory is a git repo but the pristine install commit can't be found, use commit history to identify user changes: ```bash # Find non-update commits that touched this file -git -C "$CONFIG_DIR" log --oneline --no-merges -- "{file_path}" | grep -v "gsd:update\|GSD update\|gsd-install" +git -C "$CONFIG_DIR" log --oneline --no-merges -- "{file_path}" | grep -v "gsd:update\|gsd-update\|GSD update\|gsd-install" ``` Each matching commit represents an intentional user modification. Use the commit messages and diffs to understand what was changed and why.