Returns the working tree to an up-to-date master branch via gated git switch and fast-forward pull.
npx skills add https://github.com/AlmogMaayan/ptp --skill ptp-master-almogmaayan
Please help me install this Agent Skill. Skill: ptp-master Source: https://github.com/AlmogMaayan/ptp/tree/main/skills/ptp-master Command: npx skills add https://github.com/AlmogMaayan/ptp --skill ptp-master-almogmaayan
git status --porcelain --untracked-files=all first and stops with a full report if any staged, unstaged, or untracked changes exist, so dirty work is never relocated or lost. - Safe switch and pull: Executes git switch master (leveraging git's DWIM to bootstrap master from a remote if needed) followed by git pull --ff-only, which can never create a merge commit. - Explicit failure reporting: On switch failure, diverged branches, or missing upstream, it stops and reports the exact error rather than attempting merges, rebases, or stashes. - Use Case: After archiving a completed ptp feature branch, invoke this skill to land back on a fast-forwarded master, confident that any uncommitted work would have blocked the operation instead of being stashed or overwritten. ## Quick Start Ask the assistant to return to an up-to-date master branch using the ptp-master skill, confirming the working tree is clean first.High-intent search queries and answers about installing and using this skill.
Check that the working tree is clean with git status --porcelain, then run git switch master followed by git pull --ff-only. This skill automates exactly that sequence and stops immediately if any uncommitted or untracked changes exist.
Use git pull --ff-only, which only fast-forwards the local branch to its upstream and fails instead of merging when histories have diverged. This skill always uses --ff-only and never falls back to a plain pull, merge, or rebase.
The skill stops before running any git mutation. It prints the full porcelain output, recommends committing or stashing first, and makes no switch or pull, so uncommitted work is never relocated or lost.
Yes, git's DWIM behavior creates a local master tracking a matching remote branch such as origin/master when no local master exists. If neither exists, the switch fails and the skill reports the error without attempting a pull.
A fast-forward is impossible when local and remote master histories have diverged, so --ff-only exits non-zero rather than merging. The skill reports the failure and leaves reconciliation to the user, never auto-merging or rebasing.
olliecrowCommit all uncommitted changes into small, logical commits with clear messages.
dymaydayCoordinate feature development from discovery through testing and completion evidence.
sasamukuSummarize git repository state including branch, modified, untracked, and staged files.
axel-kaliffRebase a feature branch onto the latest origin/master with conflict guidance.