holocron/plugins/git/.apm/skills/git-history/SKILL.md at 20e5627fd7efdab0f9077965f1b2b31e963a7d03

Files

Defame1297 20e5627fd7 fix(git): correct three command claims the plugin got wrong, and give rebase an owner

Three statements were false against the git in use (2.39.5), each verified by
running it.

`git rebase --autosquash HEAD~N` without `-i` is a silent no-op: git prints
"Successfully rebased", the `fixup!` commit survives with the same SHA, and
rewrite-history.md presented that as the preferred flow with `-i` as an optional
review step. The agent reports the squash as done and the `fixup!` subject then
trips this repo's own commit-msg gate. `-i` is now the command, not the alternative.

"Fetch never modifies a local branch, so it is always safe to run" — new text on
this branch — is false: `git fetch origin main:probe` fast-forwarded the local
branch, and a `+` prefix force-updates it, losing commits. The claim is scoped to
the no-refspec form.

`git worktree add --orphan` does not exist before Git 2.42; on 2.39.5 it is
`error: unknown option 'orphan'`, exit 129. The same file gives a version floor for
`--recurse-submodules` three sections earlier. Floor added, with a fallback that
was tested before being documented.

git-workflow claimed "every request resolves to exactly one of these six" while
rebase, reset and stash were owned by no skill — `git reset` appeared nowhere in
the plugin, old tree or new — so "undo my last commit" routed nowhere. The claim is
gone, the router gains rows for all three, and the procedures now exist: plain
rebase with `--onto` and conflict handling, a reset mode table gated on `--hard`,
and stash save/pop/list/drop. `--hard` gets an always-loaded Gotcha, matching the
register the force-push refusal already sets.

Cherry-pick had three claimants pointing at git-history while git-commits owned the
flow, and the two copies were not equivalent — git-history's lacked the destination
check, the rtk prefix and `--abort`. Resolved to git-commits per #112; the weaker
duplicate is replaced by a hand-off.

git-commits' metadata.version was deleted rather than bumped in 14af50b, leaving two
house-contract documents citing a worked v0.1.2 to v0.1.3 transition against a file
declaring no version. Restored to 0.1.3.

Also: the divergent-pull explanation stated a `--ff-only` default that does not
exist (it is a hard error); `--remote` "requires" a configured branch where it uses
one; `git push origin --delete` moved to git-remotes, which owns the remote-side
gates; seven retired `git:<name>` source slugs; git-orchestrate quoted a
git-workflow sentence that no longer exists; git-submodules regains the indirect
trigger that made "add a dependency repo" routable; and commit atomicity is a common
gate rather than reachable only from the create flow.

Refs: #112, #113

2026-09-01 12:38:38 +00:00

3.4 KiB

Raw Blame History

name, description, metadata, allowed-tools

name

description

metadata

allowed-tools

git-history

Use when investigating git history — pickaxe (`-S`/`-G`) or `-L` line-range log queries, tracing when a change landed, bisecting what broke something, or locating a commit to revert or backport. Not authoring or rebasing commits -> `git-commits`. Not a Gitea server's history -> `gitea-branches`.

Gotchas

-S"string" matches only where the string's count changed, so a line edited in place matches -G"regex" and not -S. Reach for -G whenever the string may have moved rather than appeared.
--follow traces renames for exactly one path. Given several paths or a glob it fails instead of degrading, so run it once per file.
Under git bisect run, exit 128 or above aborts the session rather than marking the commit bad, so a crashing test script ends the search silently.
Bisect answering "cannot find exact culprit" beside skipped commits is a complete result: it is as precise as the skip range allows.

Step 1 — Pick the entry procedure

What is known	Procedure
Content, a file, or a line range to search for	Query the log — Step 2
Nothing to search for — only that the behaviour changed between two points	Bisect — read `references/bisect.md`
The commit itself, already identified	Step 3

Step 2 — Query the log

Default to git log --oneline, then narrow by whatever is known:

Content: git log -S"string", or -G"regex" to match any diff line. --pickaxe-regex makes the -S argument a POSIX ERE; --pickaxe-all shows every file in a matching changeset.
A line or function: git log -L <start>,<end>:<file> or git log -L :<function>:<file>. Confirm the range resolves before reporting on it — an off-by-one silently omits the target.
A file across renames: git log --follow -- <file>. Without --follow the history stops at the rename boundary.
Mainline only: --first-parent follows the integration branch and skips commits merged in from side branches.
Structured output: git log --format="%h | %s | %an (%ar)".

If you need the placeholder catalogue, format presets, --diff-filter letters, full -L syntax, ancestry filters, pickaxe binary-file behaviour, or git diff output-control flags such as --stat, --word-diff and the whitespace options, read references/git-log-format.md.

Step 3 — Act on a located commit

Offer the operation and its consequence; run it only once the user has chosen.

Backporting the commit to another branch is a cherry-pick, and cherry-pick is git-commits' — it owns the destination-branch check, the rtk git wrapper and the --abort path. Hand it the SHA; do not run git cherry-pick from here.
git revert <commit> adds a new commit undoing it — for un-applying merged work without rewriting history.
git blame <file> attributes each line to the commit that last touched it, when the question is which commit introduced one specific line.

For diff output control on the located commit, read references/git-log-format.md.

Step 4 — Return the result

Report each located commit in this shape, so a calling agent can act on it without reparsing raw log output:

<sha> — <subject>
<author> (<relative date>)
Recommendation: <action or "none">

3.4 KiB Raw Blame History