git-advanced
Advanced git operations including rebase, bisect, cherry-pick, and conflict resolution. Use when rebasing branches, debugging with bisect, cherry-picking commits, or resolving complex merge conflicts.
Advanced git operations including rebase, bisect, cherry-pick, and conflict resolution.
License
License: MIT (see /LICENSE) Copyright: © 2026 J. Scott Graham (@cheddarfox) / ByBren, LLC Attribution: Required per /NOTICE
Intellectual Property
The skill system architecture and {{PROJECT_SHORT}} harness methodology are the intellectual property of J. Scott Graham and ByBren, LLC.
Quick Start
This skill activates automatically when you:
- Rebase feature branches onto dev
- Use git bisect to find bugs
- Cherry-pick commits between branches
- Resolve complex merge conflicts
- Recover from git mistakes
What This Skill Does
Provides guidance for advanced git operations with safety considerations. This project uses a rebase-first workflow with linear history - these patterns help avoid breaking the codebase.
Trigger Keywords
| Primary | Secondary | |---------|-----------| | rebase | bisect | | cherry-pick | conflict | | git reset | reflog | | force push | linear history |
Related Skills
- safe-workflow - Basic git workflow
- release-patterns - PR and merge patterns
Maintenance
| Field | Value | |-------|-------| | Last Updated | 2026-01-04 | | Harness Version | {{HARNESS_VERSION}} |
Full implementation details in SKILL.md
Related Skills
local-places
Search for places (restaurants, cafes, etc.) via Google Places API proxy on localhost.
github
Interact with GitHub using the `gh` CLI. Use `gh issue`, `gh pr`, `gh run`, and `gh api` for issues, PRs, CI runs, and advanced queries.
skill-creator
Create or update AgentSkills. Use when designing, structuring, or packaging skills with scripts, references, and assets.
voice-call
Start voice calls via the OpenClaw voice-call plugin.
notion
Notion API for creating and managing pages, databases, and blocks.
gemini
Gemini CLI for one-shot Q&A, summaries, and generation.
Category:developer