Defame1297
0fde892f20
Description 612 -> 273 chars, body 1124 -> 457 words. Branch patterns, operations, merging, comparison, and the orchestrator contract move to references/. Corrects rebase routing in four places: this skill sent rebase to git-history, which carries no rebase content and disclaims it. Rebase is git-commits'; cherry-pick and revert stay git-history's. Drops a Step 3 gate on a rebase flow this skill does not have.
55 lines
2.4 KiB
Markdown
55 lines
2.4 KiB
Markdown
---
|
|
# Research sources referenced by this skill
|
|
# Each entry documents where the skill's guidance came from.
|
|
---
|
|
|
|
## nvie-gitflow-post
|
|
|
|
**Description:** Original 2010 post by Vincent Driessen introducing the Gitflow branching model, including a 2020 reflection note recommending GitHub Flow for continuous delivery teams.
|
|
|
|
**Source:** https://nvie.com/posts/a-successful-git-branching-model/
|
|
|
|
- **Research doc:** plugins/git/docs/research/docs/git/gitflow.md (whole-document reference)
|
|
|
|
**Contributing files:**
|
|
- SKILL.md (Gitflow vs. GitHub Flow inference and the not-mixable rule)
|
|
- references/branch-patterns.md (Gitflow vs. GitHub Flow structure, defaults, and why the two are not mixable)
|
|
|
|
## atlassian-gitflow-tutorial
|
|
|
|
**Description:** Atlassian's comprehensive Gitflow tutorial covering all five branch types, lifecycle steps, and CLI usage.
|
|
|
|
**Source:** https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
|
|
|
|
- **Research doc:** plugins/git/docs/research/docs/git/gitflow.md (whole-document reference)
|
|
|
|
**Contributing files:**
|
|
- SKILL.md (Gitflow vs. GitHub Flow inference and the not-mixable rule)
|
|
- references/branch-patterns.md (Gitflow branch types, base/merge targets, `--no-ff` requirement)
|
|
- references/merging.md (`--no-ff` requirement on Gitflow supporting-branch merges)
|
|
|
|
## gitflow-cheatsheet
|
|
|
|
**Description:** Visual cheatsheet for the git-flow CLI commands (git-flow-avh fork), covering all subcommands for feature, release, and hotfix branches.
|
|
|
|
**Source:** https://danielkummer.github.io/git-flow-cheatsheet/
|
|
|
|
- **Research doc:** plugins/git/docs/research/docs/git/gitflow.md (whole-document reference)
|
|
|
|
**Contributing files:**
|
|
- references/branch-patterns.md (feature/release/hotfix naming conventions)
|
|
|
|
## context7-git-htmldocs
|
|
|
|
**Description:** Official Git HTML documentation from the git/htmldocs repository — covers all commands, concepts, and internals.
|
|
|
|
**Source:** context7:/git/htmldocs
|
|
|
|
- **Research doc:** plugins/git/docs/research/docs/git/branching-merging.md (whole-document reference)
|
|
|
|
**Contributing files:**
|
|
- SKILL.md (Gotchas — `git switch` abort-on-conflict behaviour, branch/tag name ambiguity)
|
|
- references/branch-operations.md (`git switch`/`git branch` command vocabulary and flags)
|
|
- references/merging.md (`git merge` strategies and conflict-resolution commands)
|
|
- references/comparing-branches.md (`git log`/`git diff`/`git merge-base` range syntax)
|