Git Master

What it does

Git Master is an AI agent skill designed to automate Git workflows using natural language instructions. It handles tasks such as creating commits, rebasing branches, resolving conflicts, and searching through commit history. A core principle of this skill is generating multiple commits by default, particularly when changes span several files or directories – a key differentiator from many simpler Git automation tools.

When to use it

• When you need to automate complex Git operations based on natural language requests.
• For refactoring and cleaning up branch history (rebasing).
• To quickly find out who made specific changes or when they were introduced within a repository.
• When dealing with large sets of changes that require splitting into multiple, atomic commits.

Key capabilities

• Commit Architect: Creates atomic commits, detects style issues, and manages dependency ordering.
• Rebase Surgeon: Rewrites history, resolves conflicts, and cleans up branches.
• History Archaeologist: Locates specific changes within the commit history using techniques like git blame and git bisect.
• Mode Detection: Automatically determines the appropriate Git operation (commit, rebase, or history search) based on user input.
• Parallel Context Gathering: Simultaneously retrieves information such as current status, recent commits, branch position, and upstream tracking to inform actions.

Example prompts

• "Commit these changes with a descriptive message."
• "Rebase my feature branch onto main and squash the last three commits."
• "Find when the login functionality was first implemented."
• “Cleanup this branch history”

Tips & gotchas

• Multiple Commits are Mandatory: Git Master always creates multiple commits, especially when more than two files are modified. Attempting to force a single commit will result in failure.
• File Splitting is Key: The skill prioritizes splitting changes across different directories, component types, or concerns into separate commits. Be prepared for this behavior and understand the reasoning behind it.
• Parallel Analysis: The agent performs several Git commands concurrently to gather context; be aware that this initial phase may take a moment.