Skills git-advanced

📦

git-advanced

Name: git-advanced
Author: AutumnsGrove

Content revision r3 Safe ⚙️ External commands🌐 Network access🔑 Env variables📁 Filesystem access

Master Advanced Git Workflows

Complex Git maintenance can make history changes and conflict resolution difficult. This skill provides structured guidance, recovery steps, and an optional local helper for common advanced workflows.

Supports: Claude Codex Code(CC)

💎 86 Featured

This skill is part of a pack

Install the whole pack to get every skill the task needs, in one command.

KeywayTech Coding Skills · 19 skills Install whole pack

Install with my Agent

Copy this request to your Agent. It includes the canonical Skill page and manifest.

Agent request

Review the Skillstore skill "git-advanced" from https://skillstore.io/skills/autumnsgrove-git-advanced.md and its manifest at https://skillstore.io/api/skills/autumnsgrove-git-advanced/manifest. Verify the artifact. You may proceed after verification, subject to the environment's own policy.

Your Agent should still show its plan and request any confirmation required by the security policy.

Agent-readable resources

Use these links when an AI agent, crawler, or script needs clean context instead of reading the full page.

Markdown detail GET /skills/autumnsgrove-git-advanced.md Signed manifest GET /api/skills/autumnsgrove-git-advanced/manifest Signed lockfile GET /api/skills/autumnsgrove-git-advanced/lockfile

Test it

Using "git-advanced". I accidentally started a rebase and need to return to the original branch state.

Expected outcome:

Identify whether a rebase is active.
Create or confirm a backup reference if needed.
Run the documented abort action and check status afterward.

Using "git-advanced". Our feature branch has several commits that should become one reviewable change.

Expected outcome:

Create a backup branch before changing history.
Start an interactive rebase for the selected commits.
Mark related commits for squash, verify the final log, and coordinate before pushing rewritten history.

Using "git-advanced". We need to choose a branching strategy for frequent releases.

Expected outcome:

Compare trunk-based development and Git Flow against release cadence and team size.
Define protected branches and pull request requirements.
Document naming, cleanup, release, and hotfix procedures.

Security Audit

Safe

v16 • 7/23/2026 Open versioned report

All 156 static findings were adjudicated as false positives. The detections primarily match Markdown code formatting, documented Git commands, placeholder URLs, and expected local helper behavior; no prompt injection, credential exfiltration, or unauthorized network activity was found. The helper can modify local Git state when invoked, so users should review commands and confirmations before execution.

Files scanned

4,386

Lines analyzed

Review items

False positives ignored

Risk Factors

⚙️ External commands (50)

🌐 Network access (16)

🔑 Env variables (3)

examples/conflict_resolution.md:56 examples/conflict_resolution.md:56 references/reflog-recovery.md:183

📁 Filesystem access (5)

references/troubleshooting.md:491 references/troubleshooting.md:491 references/troubleshooting.md:340 scripts/git_helper.sh:40 scripts/git_helper.sh:195

No confirmed security findings were detected by the latest completed static and semantic audit. This does not prove the skill has no side effects.

Audited by: claude View Audit History →

Share & cite this report

Share the versioned assessment report, neutral badge, embed card, and citations. Skillstore reports evidence without deciding whether this Skill is safe.

Open versioned report

Copy report link

https://skillstore.io/skills/autumnsgrove-git-advanced/audits/16?utm_source=security_passport&utm_medium=share&utm_campaign=versioned_report

Markdown badge

[![Skillstore security assessment](https://skillstore.io/badges/skills/autumnsgrove-git-advanced/security.svg)](https://skillstore.io/skills/autumnsgrove-git-advanced?utm_source=security_passport_badge)

HTML badge

<a href="https://skillstore.io/skills/autumnsgrove-git-advanced?utm_source=security_passport_badge"><img src="https://skillstore.io/badges/skills/autumnsgrove-git-advanced/security.svg" alt="Skillstore security assessment" loading="lazy"></a>

Embed card

<iframe src="https://skillstore.io/embed/skills/autumnsgrove-git-advanced.html" title="Skillstore Security Assessment" sandbox="allow-popups allow-popups-to-escape-sandbox" loading="lazy" referrerpolicy="no-referrer" width="420" height="180"></iframe>

Academic citations (APA · BibTeX · CFF)

APA citation

AutumnsGrove. (2026). git-advanced security audit report (audit version 16) [Author version unspecified]. Skillstore. https://skillstore.io/skills/autumnsgrove-git-advanced/audits/16

BibTeX citation

@techreport{autumnsgrove-autumnsgrove-git-advanced-2026,
  author = {AutumnsGrove},
  title = {git-advanced security audit report (audit version 16)},
  institution = {Skillstore},
  year = {2026},
  number = {16},
  url = {https://skillstore.io/skills/autumnsgrove-git-advanced/audits/16},
  note = {Author version unspecified}
}

CITATION.cff

cff-version: 1.2.0
message: "If you use this Skill, cite its author and this versioned security audit report."
title: "git-advanced security audit report (audit version 16)"
version: "unspecified"
type: report
authors:
  - name: "AutumnsGrove"
date-released: "2026-07-23"
url: "https://skillstore.io/skills/autumnsgrove-git-advanced/audits/16"
identifiers:
  - type: other
    value: "skillstore:autumnsgrove-git-advanced:audit:16"
    description: "Skillstore immutable audit report identifier"

Skillstore Score

Why this score Evidence Confidence: High

Architecture

Maintainability

Content

Community

Spec Compliance

What You Can Build

Clean a feature branch before review

Turn a series of work-in-progress commits into a clear reviewable history with backups and rebase guidance.

Resolve a difficult integration conflict

Choose a resolution strategy, stage the correct files, and continue or abort a merge, rebase, or cherry-pick.

Define a team branching model

Compare Git Flow and trunk-based practices, then document rules for releases, hotfixes, and feature branches.

Try These Prompts

Prepare for a safe rebase

I need to clean up my last five local commits before review. Give me a safe interactive rebase plan, including a backup step and how to abort.

Resolve a merge conflict

I have conflicts while merging main into my feature branch. Help me inspect the conflict, decide between ours and theirs, and verify the result before continuing.

Recover a lost commit

I reset my branch and cannot find a recent commit. Give me a cautious reflog recovery workflow that avoids overwriting current work.

Plan a branch cleanup

Design a branch cleanup procedure for our repository. Protect main and release branches, list candidates first, require confirmation before deletion, and include rollback guidance.

Best Practices

Create a backup branch and inspect status before rewriting history or deleting branches.
Use force-with-lease only after coordinating with affected collaborators.
Review command targets and test recovery steps in a disposable repository first.

Avoid

Do not force push rewritten shared history without team agreement.
Do not bulk-delete branches before listing and reviewing the proposed targets.
Do not resolve conflicts by choosing ours or theirs without checking the intended behavior.