From e2062a2248d0c7edb7bb1196856095036939a50e Mon Sep 17 00:00:00 2001 From: Alexander Miroshnichenko Date: Wed, 6 May 2026 11:03:30 +0300 Subject: [PATCH] Add Git workflow instructions to AGENTS.md Include guidance on using conventional-commit and git-advanced-workflows skills. Update the package addition example to reference the conventional-commit skill instead of raw git commands. --- AGENTS.md | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 02b39ce..a16c8e3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -251,6 +251,28 @@ When modifying overlay behavior: - [Nix Flake Patterns](https://github.com/NixOS/flake-patterns) - [Rust in Nixpkgs](https://nixos.org/manual/nixpkgs/stable/#rust) +## Git Workflow + +### Committing Completed Work + +Every completed job or feature must be committed to the git repository. + +When preparing git commits, always use the `conventional-commit` skill to create proper commit messages following conventional commit conventions. + +This ensures: +- Clean git history with proper commit message formatting +- No work is left uncommitted +- Consistent commit message style across the project + +### Advanced Git Operations + +For advanced Git workflows (rebasing, cherry-picking, bisect, worktrees, reflog, history recovery), use the `git-advanced-workflows` skill. + +This skill provides: +- Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog +- Maintain clean history and recover from any situation +- Manage complex Git histories, collaborate on feature branches, or troubleshoot repository issues + ## Example Workflow: Adding a New Package ```bash @@ -272,7 +294,7 @@ nix build .#my-tool # 6. Update README.md with new package info -# 7. Commit changes +# 7. Commit changes using conventional-commit skill git add packages/my-tool README.md -git commit -m "Add my-tool package" +# Then invoke: skill: "conventional-commit" ```