[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M71S9BRC9PCZ1F99VJAFKW7A":3,"skill-same:01M71S9BRC9PCZ1F99VJAFKW7A":100},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":16,"categories":17,"keywords":23,"publishedAt":44,"linkOnly":45,"markdownContent":46,"markdownBody":47,"frontMatter":48,"refName":50,"commitSha":51,"skillDirectory":52,"forksCount":53,"repositoryHtmlUrl":54,"repositoryHomepageUrl":55,"ownerHtmlUrl":56,"ownerBlogUrl":57,"ownerDescription":58,"updatedAt":59,"install":60,"resources":73},"01M71S9BRC9PCZ1F99VJAFKW7A","git-advanced-workflows",null,"Advanced Git workflows - rebase, cherry-pick, bisect, worktrees, reflog - for clean history and recovery","HigorAlves\u002Forc","HigorAlves","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F11262976?v=4","01M71S79EZEMHZ8PQSV0XQJHYY","Higor Alves","01M71S79FKKTCHCN1EDR8DSTWQ",7,"MIT","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002FSKILL.md",[18],{"categoryNo":19,"categoryName":20,"taxonomyType":21,"taxonomyTypeDesc":22},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",[24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43],"workflows","git","git advanced","git advanced workflows","advanced","troubleshooting","bisect","cherry-pick","recovery","use","git workflows","repo","for","history","rebase","worktrees","when","branches","clean","pick","2026-11-10 13:02:02",false,"---\nname: git-advanced-workflows\ndescription: Advanced Git workflows - rebase, cherry-pick, bisect, worktrees, reflog - for clean history and recovery\nwhen_to_use: Use when managing complex histories, collaborating on branches, or troubleshooting a repo.\n---\n\n# Git Advanced Workflows\n\nMaster advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.\n\n## When to Use This Skill\n\n- Cleaning up commit history before merging\n- Applying specific commits across branches\n- Finding commits that introduced bugs\n- Working on multiple features simultaneously\n- Recovering from Git mistakes or lost commits\n- Managing complex branch workflows\n- Preparing clean PRs for review\n- Synchronizing diverged branches\n\n## Which Tool for Which Situation\n\n| Situation | Tool | Reference |\n| --- | --- | --- |\n| Clean up \u002F squash \u002F reword \u002F reorder \u002F split commits before a PR | Interactive rebase | `references\u002Frebase.md` |\n| Update a feature branch with `main`, decide rebase vs merge | Rebase \u002F merge | `references\u002Frebase.md` |\n| Apply a single commit (e.g. hotfix) to other branches\u002Freleases | Cherry-pick | `references\u002Fcherry-pick.md` |\n| Apply only specific files from a commit | Partial cherry-pick | `references\u002Fcherry-pick.md` |\n| Find the commit that introduced a bug | Bisect | `references\u002Fbisect.md` |\n| Work on multiple branches at once without stashing | Worktrees | `references\u002Fworktrees.md` |\n| Recover lost commits \u002F deleted branches \u002F undo a bad reset | Reflog & recovery | `references\u002Freflog-recovery.md` |\n| Abort an in-progress rebase\u002Fmerge\u002Fcherry-pick\u002Fbisect | Recovery commands | `references\u002Freflog-recovery.md` |\n| Safety rules before rewriting shared history | Best practices & pitfalls | `references\u002Fhistory-rewrite.md` |\n\nRead the matching `references\u002F*.md` file when you need the detailed commands and worked examples for that situation. Load only the references relevant to the task at hand.\n\n## References\n\n- `references\u002Frebase.md` - interactive rebase operations, clean-up-before-PR workflow, rebase vs merge strategy, autosquash, splitting commits.\n- `references\u002Fcherry-pick.md` - cherry-picking single commits\u002Franges, hotfix-to-multiple-releases workflow, partial (per-file) cherry-pick.\n- `references\u002Fbisect.md` - manual and automated `git bisect` to locate a bug-introducing commit.\n- `references\u002Fworktrees.md` - managing multiple worktrees for simultaneous multi-branch development.\n- `references\u002Freflog-recovery.md` - using reflog to recover lost commits\u002Fbranches, undo resets, and abort in-progress operations.\n- `references\u002Fhistory-rewrite.md` - cross-cutting best practices and common pitfalls when rewriting history (force-with-lease, backups, public branches).\n","# Git Advanced Workflows\n\nMaster advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.\n\n## When to Use This Skill\n\n- Cleaning up commit history before merging\n- Applying specific commits across branches\n- Finding commits that introduced bugs\n- Working on multiple features simultaneously\n- Recovering from Git mistakes or lost commits\n- Managing complex branch workflows\n- Preparing clean PRs for review\n- Synchronizing diverged branches\n\n## Which Tool for Which Situation\n\n| Situation | Tool | Reference |\n| --- | --- | --- |\n| Clean up \u002F squash \u002F reword \u002F reorder \u002F split commits before a PR | Interactive rebase | `references\u002Frebase.md` |\n| Update a feature branch with `main`, decide rebase vs merge | Rebase \u002F merge | `references\u002Frebase.md` |\n| Apply a single commit (e.g. hotfix) to other branches\u002Freleases | Cherry-pick | `references\u002Fcherry-pick.md` |\n| Apply only specific files from a commit | Partial cherry-pick | `references\u002Fcherry-pick.md` |\n| Find the commit that introduced a bug | Bisect | `references\u002Fbisect.md` |\n| Work on multiple branches at once without stashing | Worktrees | `references\u002Fworktrees.md` |\n| Recover lost commits \u002F deleted branches \u002F undo a bad reset | Reflog & recovery | `references\u002Freflog-recovery.md` |\n| Abort an in-progress rebase\u002Fmerge\u002Fcherry-pick\u002Fbisect | Recovery commands | `references\u002Freflog-recovery.md` |\n| Safety rules before rewriting shared history | Best practices & pitfalls | `references\u002Fhistory-rewrite.md` |\n\nRead the matching `references\u002F*.md` file when you need the detailed commands and worked examples for that situation. Load only the references relevant to the task at hand.\n\n## References\n\n- `references\u002Frebase.md` - interactive rebase operations, clean-up-before-PR workflow, rebase vs merge strategy, autosquash, splitting commits.\n- `references\u002Fcherry-pick.md` - cherry-picking single commits\u002Franges, hotfix-to-multiple-releases workflow, partial (per-file) cherry-pick.\n- `references\u002Fbisect.md` - manual and automated `git bisect` to locate a bug-introducing commit.\n- `references\u002Fworktrees.md` - managing multiple worktrees for simultaneous multi-branch development.\n- `references\u002Freflog-recovery.md` - using reflog to recover lost commits\u002Fbranches, undo resets, and abort in-progress operations.\n- `references\u002Fhistory-rewrite.md` - cross-cutting best practices and common pitfalls when rewriting history (force-with-lease, backups, public branches).\n",{"name":5,"description":7,"when_to_use":49},"Use when managing complex histories, collaborating on branches, or troubleshooting a repo.","main","7522fd7266944e30052204c2f6df287d8b5516be","codex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows",0,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc","https:\u002F\u002Forc.novacstack.com\u002F","https:\u002F\u002Fgithub.com\u002FHigorAlves","higoralves.dev","Software Engineering","2026-11-07 07:26:38",{"source":8,"skillName":5,"commands":61,"prompt":71,"zipAvailable":72},[62,65,68],{"tool":63,"command":64},"npx","npx skills add HigorAlves\u002Forc --skill git-advanced-workflows",{"tool":66,"command":67},"bunx","bunx skills add HigorAlves\u002Forc --skill git-advanced-workflows",{"tool":69,"command":70},"pnpm","pnpm dlx skills add HigorAlves\u002Forc --skill git-advanced-workflows","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002FSKILL.md",true,[74,80,84,88,92,96],{"path":75,"resourceType":76,"resourceTypeDesc":77,"sizeBytes":78,"sourceHtmlUrl":79},"references\u002Fbisect.md","REFERENCE","参考文档",1072,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002Freferences\u002Fbisect.md",{"path":81,"resourceType":76,"resourceTypeDesc":77,"sizeBytes":82,"sourceHtmlUrl":83},"references\u002Fcherry-pick.md",1069,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002Freferences\u002Fcherry-pick.md",{"path":85,"resourceType":76,"resourceTypeDesc":77,"sizeBytes":86,"sourceHtmlUrl":87},"references\u002Fhistory-rewrite.md",1477,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002Freferences\u002Fhistory-rewrite.md",{"path":89,"resourceType":76,"resourceTypeDesc":77,"sizeBytes":90,"sourceHtmlUrl":91},"references\u002Frebase.md",2419,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002Freferences\u002Frebase.md",{"path":93,"resourceType":76,"resourceTypeDesc":77,"sizeBytes":94,"sourceHtmlUrl":95},"references\u002Freflog-recovery.md",1222,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002Freferences\u002Freflog-recovery.md",{"path":97,"resourceType":76,"resourceTypeDesc":77,"sizeBytes":98,"sourceHtmlUrl":99},"references\u002Fworktrees.md",1111,"https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Fcodex\u002Forc\u002Fcontent\u002Fskills\u002Fgit-advanced-workflows\u002Freferences\u002Fworktrees.md",[101,136,160,179,201,221],{"skillNo":102,"name":103,"nameZh":6,"description":104,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":105,"categories":106,"keywords":118,"publishedAt":44},"01M71SW40F9TAAEDKBYYBCM814","writing-plans","Write a comprehensive implementation plan of bite-sized TDD tasks that an engineer with zero codebase context could execute — exact files, code, tests, and verification steps","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Forc\u002Fskills\u002Fwriting-plans\u002FSKILL.md",[107,110,115],{"categoryNo":108,"categoryName":109,"taxonomyType":21,"taxonomyTypeDesc":22},"01JBSEEDCAT000000000000018","写作与文案",{"categoryNo":111,"categoryName":112,"taxonomyType":113,"taxonomyTypeDesc":114},"01JBSEEDCAT000000000000030","开发工程师","PROFESSION","适用职业",{"categoryNo":116,"categoryName":117,"taxonomyType":113,"taxonomyTypeDesc":114},"01JBSEEDCAT000000000000036","内容创作者",[119,120,121,122,123,124,125,40,126,127,128,129,130,131,132,133,134,36,135,33],"writing","writing plans","plans","engineer","superpowers","implementation plan","files","you","code","tasks","verification","plan","write","steps","context","ZeRO","tests",{"skillNo":137,"name":138,"nameZh":6,"description":139,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":140,"categories":141,"keywords":145,"publishedAt":44},"01M71SW15KHE4MHJW9NEXV65X2","writing-for-agents","orc's doctrine layer for writing any document an agent consumes — skills, AGENTS.md\u002FCLAUDE.md, reference docs","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Forc\u002Fskills\u002Fwriting-for-agents\u002FSKILL.md",[142,143,144],{"categoryNo":108,"categoryName":109,"taxonomyType":21,"taxonomyTypeDesc":22},{"categoryNo":19,"categoryName":20,"taxonomyType":21,"taxonomyTypeDesc":22},{"categoryNo":116,"categoryName":117,"taxonomyType":113,"taxonomyTypeDesc":114},[146,119,36,147,40,148,149,150,151,152,153,154,33,155,156,157,158,159],"writing for agents","matt pocock","inline","tuning","a skill","layer","doctrine","push","editing","document","github","https","reference","docs",{"skillNo":161,"name":162,"nameZh":6,"description":163,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":164,"categories":165,"keywords":167,"publishedAt":44},"01M71SVYQKXT743HHHWGHT3G13","workspace-mode","Use when cwd is a parent dir holding multiple sibling git repos — defines repo auto-detection, --repos\u002F--repo\u002F--all-repos\u002F--this-repo precedence, per-repo dispatch, and linked-PR mechanics.","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Forc\u002Fskills\u002Fworkspace-mode\u002FSKILL.md",[166],{"categoryNo":19,"categoryName":20,"taxonomyType":21,"taxonomyTypeDesc":22},[168,169,170,171,172,40,173,25,174,35,33,175,176,177,178],"workspace mode","mode","workspace","mechanics","auto","repos","pr","dispatch","auto-detection","detection","parent",{"skillNo":180,"name":181,"nameZh":6,"description":182,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":183,"categories":184,"keywords":186,"publishedAt":44},"01M71SVVP3BXS06G9395P2K0RH","wizard","Generate an interactive bash wizard walking a human through work only they can perform — credentials, secrets, one-off migrations","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Forc\u002Fskills\u002Fwizard\u002FSKILL.md",[185],{"categoryNo":19,"categoryName":20,"taxonomyType":21,"taxonomyTypeDesc":22},[181,187,188,189,190,147,40,191,192,193,194,195,196,132,197,198,36,33,199,200],"condition","never","provisioning infrastructure","only","Bash","work","credentials","generate","human","secrets","infrastructure","do","one","interactive",{"skillNo":202,"name":203,"nameZh":6,"description":204,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":205,"categories":206,"keywords":207,"publishedAt":44},"01M71SVT4AR6NKAM5B077E7QSJ","wait-what","Stop and re-pitch — the last message did not land; say it again simply, in the project's own vocabulary.","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Forc\u002Fskills\u002Fwait-what\u002FSKILL.md",[],[208,209,210,211,212,147,213,214,215,216,156,157,217,218,219,220],"wait what","wait","project","re","true","pitch","last","say","message","land","it","stop","vocabulary",{"skillNo":222,"name":223,"nameZh":6,"description":224,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":225,"categories":226,"keywords":231,"publishedAt":44},"01M71SVQVYRA9QBQ6G8MWR8G6F","vitest","Vitest fast unit testing framework powered by Vite with Jest-compatible API","https:\u002F\u002Fgithub.com\u002FHigorAlves\u002Forc\u002Fblob\u002Fmain\u002Forc\u002Fskills\u002Fvitest\u002FSKILL.md",[227,230],{"categoryNo":228,"categoryName":229,"taxonomyType":21,"taxonomyTypeDesc":22},"01JBSEEDCAT000000000000008","测试与质量",{"categoryNo":111,"categoryName":112,"taxonomyType":113,"taxonomyTypeDesc":114},[223,232,233,234,235,236,119,40,237,238,239,240,241,242,243,244,245,246,135,247],"coverage","unit","testing","testing framework","generated","api","jest","2026","at","scripts","unit testing","antfu","framework","vite","mocking","dev"]