Agent skill

Git Branch Mixer

by aspiers in aspiers/git-config

Manage git branch mixes and run mixdowns using ggmx and ggmxd.

GPL-3.0Auto-check passedDevelopment

Install Git Branch Mixer

skills CLI
$ npx skills add aspiers/git-config --skill git-branch-mixer -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install aspiers/git-config git-branch-mixer --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/aspiers/git-config.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/git-branch-mixer .claude/skills/git-branch-mixer && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
git-branch-mixer
GitHub stars
105
Token cost
~985 tokens
SKILL.md length
329 words
Files
1
Skills in repo
1
Repo updated
First seen
Licence
GPL-3.0

At a glance

Manage git branch mixes and run mixdowns using ggmx and ggmxd.

  • The user says things like add this branch to the mix
  • SKILL.md covers Configuring mixes with ggmx, Running a mixdown with ggmxd, After changing a mix and Typical workflow
  • Calls git
  • Remove a branch from the mix

What it does

Git Branch Mixer is an agent skill from aspiers/git-config. Manage git branch mixes and run mixdowns using ggmx and ggmxd. Use when the user says things like "add this branch to the mix", "remove a branch from the mix", "show the mix", "mix down the branches", or "run a mixdown".

Its SKILL.md is about 990 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: Adam's git shortcuts and environment. Designed to be stowed to ~ using GNU Stow. The licence is GPL-3.0.

When your agent uses it

  • The user says things like add this branch to the mix
  • Remove a branch from the mix
  • Mix down the branches

Example prompts

  • “add this branch to the mix”
  • “remove a branch from the mix”
  • “show the mix”
  • “/git-branch-mixer”

What it can do on your machine

Read from SKILL.md and the folder at commit 710ab4c. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Git Branch Mixer loads about 985 tokens when it runs. Until then it costs about 59 tokens; SKILL.md has 329 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~59
When it runs · the whole SKILL.md, loaded when a task matches
~985

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from aspiers/git-config at commit 710ab4c, republished under its GPL-3.0 licence (© aspiers). 329 words, ~985 tokens.

Download SKILL.mdSave it as .claude/skills/git-branch-mixer/SKILL.md (or your agent's skills folder).
name
git-branch-mixer
description
Manage git branch mixes and run mixdowns using ggmx and ggmxd. Use when the user says things like "add this branch to the mix", "remove a branch from the mix", "show the mix", "mix down the branches", or "run a mixdown".
disable-model-invocation
true

Git Branch Mixer

ggmx (git mix) configures named sets of branches to merge together. ggmxd (git mixdown) executes a mixdown — resetting a target branch to a base and merging all the other branches in.

The typical use case is testing a combination of feature/bugfix branches together via a throw-away temporary working branch.

Critical rule: mixdown target branches (especially working) are local throw-away integration branches. Never push a mixdown target branch, create a PR from it, or otherwise publish it unless the user explicitly asks for that exact action. Independent source branches may be pushed as needed, but the mixed working branch stays local by default.

Default location: when producing a mixdown for the working branch, run it from the repository's main checkout, not from a linked worktree, unless the user specifies another location. The main checkout is normally where the combined software is built, run, and tested; source branches may still live in linked worktrees. Because the mixdown checks out and resets working, stop and ask before stashing or otherwise moving aside changes from a dirty main checkout.

Configuring mixes with ggmx

bash
ggmx                          # show all configured mixes
ggmx <target>                 # show branches in mix for <target>
ggmx <target> A B C           # set mix for <target> to branches A, B, C
                               # (first branch is the base)
ggmx [<target>] +D [-B]       # add D to / remove B from mix for <target>
                               # (defaults to 'working' if <target> omitted)
ggmx -d <target>              # delete the mix for <target>

Mixes are stored in git config under mixdown.<target>. You can also edit them directly with git config --edit.

Running a mixdown with ggmxd

bash
ggmxd                          # run mixdown using config for default target ('working')
ggmxd -b <target>              # run mixdown using config for <target>
ggmxd BASE B1 [B2 ...]         # explicit mixdown: reset to BASE, merge B1, B2...
ggmxd -b <target> BASE B1 ...  # explicit mixdown into named target branch

Always pass -c / --checkout to leave the target branch checked out after the mixdown, ready for testing:

bash
ggmxd -c                       # mixdown from config, stay on target branch
ggmxd -c BASE B1 B2            # explicit mixdown, stay on target branch

Without -c, ggmxd restores your previously checked-out branch after completing the mixdown. Use this when you want to rebuild the mix in the background without switching away from your current branch.

After a successful mixdown, if the combined software can be run or otherwise tested, rebuild it and restart the running instance from the main checkout before reporting it ready. A mixdown that has not reached the user's actual test environment is not complete.

Other options
bash
ggmxd -s STRATEGY              # set merge strategy (default: octopus)
                               # use e.g. -s recursive for sequential merges
                               # with conflict resolution shells between each

After changing a mix

After any ggmx operation that modifies a mix (adding, removing, or setting branches), always ask the user whether they want to run a mixdown now.

Typical workflow

bash
# One-time setup: configure the mix for the 'working' target branch
ggmx working main feature/foo bugfix/bar

# Add another branch later
ggmx +feature/baz

# Run the mixdown and stay on the result for testing
ggmxd -c

# Rebuild after rebasing one of the branches
ggmxd -c

© aspiers, GPL-3.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in .agents/skills/git-branch-mixer of aspiers/git-config.

Open the folder on GitHubat commit 710ab4c

Compare with similar skills

Git Branch Mixer next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Git Branch Mixer compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Branch Mixer this skillaspiers/git-config105—~985Automated safety check: PassGPL-3.0
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost56k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed
  • Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed
  • Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed
  • Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    56k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed
  • Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed
  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

Works with

Categories

Questions about Git Branch Mixer

What does Git Branch Mixer do?

Manage git branch mixes and run mixdowns using ggmx and ggmxd. Git Branch Mixer is an agent skill from aspiers/git-config. Manage git branch mixes and run mixdowns using ggmx and ggmxd.

When should I use Git Branch Mixer?

Git Branch Mixer fits situations like: the user says things like add this branch to the mix; remove a branch from the mix; mix down the branches.

How do I install Git Branch Mixer in Claude Code?

Run `npx skills add aspiers/git-config --skill git-branch-mixer -a claude-code`. Or copy the skill folder (.agents/skills/git-branch-mixer in aspiers/git-config) into .claude/skills/git-branch-mixer in your project. Claude Code loads it when a task matches its description.

How do I install Git Branch Mixer in Codex?

Run `npx skills add aspiers/git-config --skill git-branch-mixer -a codex`. Or copy the skill folder (.agents/skills/git-branch-mixer in aspiers/git-config) into .agents/skills/git-branch-mixer in your project. Codex loads it when a task matches its description.

Can I use Git Branch Mixer in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add aspiers/git-config --skill git-branch-mixer -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/git-branch-mixer, .gemini/skills/git-branch-mixer, .github/skills/git-branch-mixer and .opencode/skills/git-branch-mixer in your project.

What does Git Branch Mixer need to run?

Going by SKILL.md and its folder, Git Branch Mixer needs the command-line tools its instructions call (git).

Does Git Branch Mixer access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Git Branch Mixer safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Git Branch Mixer use?

Git Branch Mixer is published under the GPL-3.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Branch Mixer use?

About 985 tokens (SKILL.md is roughly 3.9k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Git Branch Mixer?

Skills that share tags, products or a category with Git Branch Mixer: Finishing a Development Branch (obra/superpowers, 297k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Branch Mixer?

aspiers (a GitHub user) maintains it in aspiers/git-config, which has 105 GitHub stars. The repository was last updated on September 8, 2026.

Source: aspiers/git-config on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.