JetVS Git

JetBrains-style Git tool window for VS Code (bottom panel, Cmd/Alt+9).

• Log tab: commit graph, branch tree (local / remote / tags), commit details + changed files (click = diff), search by text or hash, filter by branch / user.
• Commit context menu: Copy Revision, Create Patch, Cherry-Pick, Checkout Revision, Show Repository at Revision, Compare with Local, Self-Review with AI, Reset (soft/mixed/hard/keep), Revert, Undo Commit, Edit Message (F2), Fixup, Squash Into, Drop, Squash Commits, Interactive Rebase, Push All up to Here, New Branch, New Tag, Go to Child/Parent (←/→).
• Branch context menu: Checkout, New Branch from, Merge into current, Rebase onto, Pull, Push, Force Push (with lease), Rename, Delete.
• Commit tab: VS Code-style Merge Changes / Staged Changes / Changes sections with hover actions (stage +, unstage −, discard ↩, open file), partially staged files shown in both; committing with nothing staged offers to stage all (jetGit.smartCommit); Commit / Commit and Push / Amend, ✨ Generate commit message (VS Code Language Model API, e.g. Copilot; falls back to a heuristic).
• Merge… (toolbar / branch menu / Jet Git: Merge…): pick a branch and options (--no-ff, --ff-only, --squash, --no-commit, --no-verify, --allow-unrelated-histories, -m).
• Conflicts (JetBrains-style): when merge / pull / rebase / cherry-pick / revert stops on conflicts, a Conflicts dialog lists files with Yours / Theirs status and Accept Yours, Accept Theirs, Merge…. Merge… opens a three-pane merge window (Your version | Result | Changes from) with »/«/× per change, apply all non-conflicting changes, F7 / Shift+F7 navigation, editable result, Accept Left / Accept Right / Apply. Deleted-vs-modified and binary files get a keep/delete or yours/theirs choice.
• Conflict banner with Resolve… / Continue / Skip / Abort for rebase, cherry-pick, merge, revert.
• Commit details: changed files as List or Tree (grouped by directory).

Setting: jetGit.pullStrategy (merge | rebase | ff-only).

Develop: npm i && npm test, package with npm run package, then code --install-extension jet-git.vsix.