Agent skill

Git Expert

by RightNow-AI in RightNow-AI/openfang

Git operations expert for branching, rebasing, conflicts, and workflows

Apache-2.0Auto-check passedDevelopment

Install Git Expert

skills CLI
$ npx skills add RightNow-AI/openfang --skill git-expert -a claude-code

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

GitHub CLI
$ gh skill install RightNow-AI/openfang git-expert --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/RightNow-AI/openfang.git skills-src && mkdir -p .claude/skills && cp -r skills-src/crates/openfang-skills/bundled/git-expert .claude/skills/git-expert && 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-expert
GitHub stars
18k
Token cost
~689 tokens
SKILL.md length
362 words
Files
1
Skills in repo
68
Repo updated
First seen
Licence
Apache-2.0

At a glance

Git operations expert for branching, rebasing, conflicts, and workflows

  • Tasks that involve Git workflow
  • SKILL.md covers Key Principles, Branching Strategies, Rebasing and Merging and Conflict Resolution, plus 2 more sections
  • Calls git

What it does

Git Expert is an agent skill from RightNow-AI/openfang. Git operations expert for branching, rebasing, conflicts, and workflows

Its SKILL.md is about 690 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: Open-source Agent Operating System. The licence is Apache-2.0.

When your agent uses it

  • Tasks that involve Git workflow

Example prompts

  • “/git-expert”

What it can do on your machine

Read from SKILL.md and the folder at commit acf2587. 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 Expert loads about 689 tokens when it runs. Until then it costs about 21 tokens; SKILL.md has 362 words of instructions outside code blocks.

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

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 RightNow-AI/openfang at commit acf2587, republished under its Apache-2.0 licence (© RightNow-AI). 362 words, ~689 tokens.

Download SKILL.mdSave it as .claude/skills/git-expert/SKILL.md (or your agent's skills folder).
name
git-expert
description
Git operations expert for branching, rebasing, conflicts, and workflows

Git Operations Expert

You are a Git specialist. You help users manage repositories, resolve conflicts, design branching strategies, and recover from mistakes using Git's full feature set.

Key Principles

  • Always check the current state (git status, git log --oneline -10) before performing destructive operations.
  • Prefer small, focused commits with clear messages over large, monolithic ones.
  • Never rewrite history on shared branches (main, develop) unless the entire team agrees.
  • Use git reflog as your safety net — almost nothing in Git is truly lost.

Branching Strategies

  • Trunk-based: short-lived feature branches, merge to main frequently. Best for CI/CD-heavy teams.
  • Git Flow: main, develop, feature/*, release/*, hotfix/*. Best for versioned release cycles.
  • GitHub Flow: branch from main, open PR, merge after review. Simple and effective for most teams.
  • Name branches descriptively: feature/add-user-auth, fix/login-timeout, chore/update-deps.

Rebasing and Merging

  • Use git rebase to keep a linear history on feature branches before merging.
  • Use git merge --no-ff when you want to preserve the branch topology in the history.
  • Interactive rebase (git rebase -i) is powerful for squashing fixup commits, reordering, and editing messages.
  • After rebasing, you must force-push (git push --force-with-lease) — use --force-with-lease to avoid overwriting others' work.
Show full SKILL.md (171 more words)Show less

Conflict Resolution

  • Use git diff and git log --merge to understand the conflicting changes.
  • Resolve conflicts in an editor or merge tool, then git add the resolved files and git rebase --continue or git merge --continue.
  • If a rebase goes wrong, git rebase --abort returns to the pre-rebase state.
  • For complex conflicts, consider git rerere to record and replay resolutions.

Recovery Techniques

  • Accidentally committed to wrong branch: git stash, git checkout correct-branch, git stash pop.
  • Need to undo last commit: git reset --soft HEAD~1 (keeps changes staged).
  • Deleted a branch: find the commit with git reflog and git checkout -b branch-name <sha>.
  • Need to recover a file from history: git restore --source=<commit> -- path/to/file.

Pitfalls to Avoid

  • Never use git push --force on shared branches — use --force-with-lease at minimum.
  • Do not commit large binary files — use Git LFS or .gitignore them.
  • Do not store secrets in Git history — if committed, rotate the secret immediately and use git filter-repo to purge.
  • Avoid very long-lived branches — they accumulate merge conflicts and diverge from main.

© RightNow-AI, Apache-2.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 crates/openfang-skills/bundled/git-expert of RightNow-AI/openfang.

Open the folder on GitHubat commit acf2587

Compare with similar skills

Git Expert 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 Expert compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Git Expert this skillRightNow-AI/openfang18k—~689Automated safety check: PassApache-2.0
Finishing a Development Branchobra/superpowers296k5 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/Ghost55k—~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.

    296k 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.

    55k 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

More from RightNow-AI/openfang

All 68 skills in this repo
  • Reference of CSS selectors, step-by-step web workflows and error recovery tactics for an agent that browses, fills forms and compares prices on live sites.

    18k GitHub stars~1k tokensUpdated 3 mo ago
    Auto-check passed
  • Reference knowledge for open-source intelligence collection: the collection cycle, source reliability tiers, search query patterns and entity extraction.

    18k GitHub stars~2.1k tokensUpdated 3 mo ago
    Auto-check passed
  • Lead Generation Research Guide

    RightNow-AI/openfang

    Reference knowledge for AI lead generation: building an ideal customer profile, researching prospects on the web, enriching lead records and finding email formats.

    18k GitHub stars~1.8k tokensUpdated 3 mo ago
    Auto-check passed
  • Video Clipping Reference

    RightNow-AI/openfang

    Command reference for cutting clips from online video: yt-dlp downloads, whisper transcription, SRT subtitle files and ffmpeg processing, with Windows, macOS and Linux differences.

    18k GitHub stars~4.1k tokensUpdated 3 mo ago
    Auto-check: warnings
  • Forecasting Expert Knowledge

    RightNow-AI/openfang

    Reference knowledge for AI forecasting: superforecasting principles, a signal taxonomy, confidence calibration rules and reasoning chains for making and tracking predictions.

    18k GitHub stars~2.5k tokensUpdated 3 mo ago
    Auto-check passed
  • Deep Research Methodology

    RightNow-AI/openfang

    Reference knowledge for AI deep research: a five-phase process, strategies by question type, CRAAP source scoring, cross-referencing, synthesis and citation formats.

    18k GitHub stars~2.6k tokensUpdated 3 mo ago
    Auto-check passed

Works with

Categories

Questions about Git Expert

What does Git Expert do?

Git operations expert for branching, rebasing, conflicts, and workflows. Git Expert is an agent skill from RightNow-AI/openfang.

When should I use Git Expert?

Git Expert fits situations like: tasks that involve Git workflow.

How do I install Git Expert in Claude Code?

Run `npx skills add RightNow-AI/openfang --skill git-expert -a claude-code`. Or copy the skill folder (crates/openfang-skills/bundled/git-expert in RightNow-AI/openfang) into .claude/skills/git-expert in your project. Claude Code loads it when a task matches its description.

How do I install Git Expert in Codex?

Run `npx skills add RightNow-AI/openfang --skill git-expert -a codex`. Or copy the skill folder (crates/openfang-skills/bundled/git-expert in RightNow-AI/openfang) into .agents/skills/git-expert in your project. Codex loads it when a task matches its description.

Can I use Git Expert 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 RightNow-AI/openfang --skill git-expert -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-expert, .gemini/skills/git-expert, .github/skills/git-expert and .opencode/skills/git-expert in your project.

What does Git Expert need to run?

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

Does Git Expert 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 Expert 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 Expert use?

Git Expert is published under the Apache-2.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Git Expert use?

About 689 tokens (SKILL.md is roughly 2.8k 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 Expert?

Skills that share tags, products or a category with Git Expert: Finishing a Development Branch (obra/superpowers, 296k 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, 55k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Git Expert?

RightNow-AI (a GitHub organization) maintains it in RightNow-AI/openfang, which has 18,212 GitHub stars. The repository holds 68 skills in this directory. The repository was last updated on July 2, 2026.

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