Merge branch 'adding-pi-harness'

1 files changed, 38 insertions, 0 deletions

diff --git a/modules/development/pi-coding-agent/skills/git/SKILL.md b/modules/development/pi-coding-agent/skills/git/SKILL.md
new file mode 100644
index 0000000..df60f8f
--- /dev/null
+++ b/modules/development/pi-coding-agent/skills/git/SKILL.md
@@ -0,0 +1,38 @@
+---
+name: git
+description: "Inspect status/diff/history, preserve user work, create focused commits when requested, help with merges/rebases/conflicts."
+---
+
+# Git Skill
+
+Inspect status/diff/history, preserve user work, create focused commits when requested, help with merges/rebases/conflicts.
+
+## Subagents
+When you need to delegate sub‑tasks, use the `pi-subagents` skill.
+
+**Example:** When preparing a complex merge, spawn a **scout** to analyze the commit history of the `feature` branch, another **scout** to inspect the conflicting files in `core`, and a **reviewer** to verify the merged result passes all tests before pushing.
+
+*You may adapt the delegation pattern to fit the exact requirements of the codebase.*
+
+## Operations
+
+### Inspect
+- `git status` - working tree state
+- `git diff` - unstaged changes
+- `git diff --cached` - staged changes
+- `git log --oneline -20` - recent history
+
+### Preserve
+- Never discard user changes
+- Stash before risky operations
+- Backup before rewrites
+
+### Commit
+- One logical change per commit
+- Clear, imperative messages
+- Reference issues when applicable
+- Use strict commit message formats
+
+### Merge
+- Prefer merge with commits
+- Resolve conflicts incrementally