Git4VSC

Focused Git workflows for Visual Studio Code.

面向 Visual Studio Code 的紧凑 Git 工作流扩展。

English · 简体中文

0.1.0 Preview — Ready for evaluating the main commit, history, branch, push, blame, and conflict workflows.

Product tour / 功能预览

Commit workspace, Commit Log and Git Blame / 提交工作区、提交日志与 Git Blame

From Annotate with Git Blame to Commit / 从代码追溯到完成提交

Optional AI commit message settings / 可选的 AI 提交信息设置

English

Git4VSC brings a focused commit window, a topology-aware Commit Log, branch status, push previews, and guided conflict resolution to VS Code. It uses the local Git CLI and keeps VS Code's native editor, Diff viewer, and Merge Editor at the center of the workflow.

Highlights

• Focused commit workflow: Select files or individual change blocks, review diffs, roll back changes, and use Commit or Commit and Push.
• Update and repository status: Update with Merge or Rebase, monitor ahead/behind counts, and receive unobtrusive progress and result feedback.
• Safe push workflow: Preview outgoing commits, protect branch patterns from Force Push, confirm history rewrites, and recover rejected pushes with Merge or Rebase.
• Commit Log: Browse a topology graph with persistent selection, virtual scrolling, relative dates, and configurable Author, Date, and Hash columns.
• Powerful filtering: Search text or hashes with regex, case matching, and recent history; combine Branch, User, Date, and custom Path filters.
• Commit and file actions: Compare revisions, Cherry-Pick, Revert, Reset, create branches or tags, export patches, restore files, and apply selected file changes.
• Branch workflows: Manage local and remote branches, favorites, tracking, tags, remotes, and new worktrees with ahead/behind indicators.
• Smart operations and Stash: When local changes block Update or Checkout, stash and restore them automatically; create, apply, pop, drop, inspect, or branch from Git stashes.
• Guided conflicts: Resolve files one by one in a Current / Result / Incoming column layout, then continue or abort Merge, Rebase, Cherry-Pick, or Revert.
• Git Blame: Toggle compact annotations from the editor line-number menu, with time-based colors and detailed hover information.
• Optional AI messages: Generate a commit message from the selected changes through your own OpenAI-compatible endpoint.

Getting started

1. Open a workspace containing a Git repository.
2. Select Git4VSC in the Activity Bar.
3. Select the files to commit and double-click a file to review its Diff.
4. Enter a commit message, then select Commit or Commit and Push.
5. Review outgoing commits and files before pushing.

Press Alt+3 to toggle Commit Log. Select the status-bar branch name for repository and branch actions, or select the adjacent Commit Log icon to toggle only the log panel.

Main interactions

Repository feedback

Ahead and behind counts appear in the Commit title, branch list, and status bar. Long-running operations show progress without shifting file layouts, and short notifications report results such as an already up-to-date branch.

AI and privacy

Open Git4VSC Settings → AI to configure a Base URL, API key, model, language, and optional instructions. The API key is stored in VS Code SecretStorage. Git4VSC sends only the selected change context, and only when you explicitly request a message. The extension contains no telemetry.

Current preview scope

• Commits support whole files and Git change blocks. Line-level selection and persistent changelists are not included yet.
• New worktrees can be created, but there is no full worktree management page yet.
• Path filtering is available in Commit Log; a dedicated rename-aware File History view is not yet included.
• Git Stash is available; Shelf and Interactive Rebase are not included yet.

Requirements

• Visual Studio Code 1.102.0 or newer.
• Git 2.23 or newer available to the extension host.
• A Git repository opened in the current local or remote workspace.

简体中文

Git4VSC 为 VS Code 提供聚焦的 Commit 工具窗口、拓扑 Commit Log、分支状态、Push 预览和逐文件冲突流程。扩展调用本机 Git CLI，并继续使用 VS Code 原生编辑器、Diff 和 Merge Editor。

主要功能

• 紧凑提交： 勾选文件或单独的 Change Block、检查 Diff、回滚变更，并使用 Commit 或 Commit and Push。
• 更新与仓库状态： 使用 Merge 或 Rebase 更新，查看 ahead/behind 数量，并获得不干扰布局的进度和结果反馈。
• 安全 Push： 检查待推送提交和文件，保护指定分支免受 Force Push，在历史改写前确认，并用 Merge/Rebase 恢复被拒绝的 Push。
• Commit Log： 浏览拓扑图，保留选择和筛选状态，使用虚拟滚动、相对时间以及可配置的 Author、Date、Hash 列。
• 组合筛选： Text or hash 支持正则、大小写匹配和最近搜索，并可组合 Branch、User、Date、Paths 条件。
• 提交与文件操作： 比较版本、Cherry-Pick、Revert、Reset、创建分支或 Tag、导出 Patch、恢复文件和选择性应用变更。
• 分支工作流： 管理本地/远程分支、收藏、Tracking、Tag、Remote 和新 Worktree，并显示 ahead/behind。
• Smart Operation 与 Stash： 本地修改阻塞 Update/Checkout 时自动暂存并恢复；支持创建、Apply、Pop、Drop、查看 Stash 或从 Stash 建分支。
• 冲突流程： 在 Current / Result / Incoming 三列 Merge Editor 中逐个解决文件，然后 Continue 或 Abort Merge、Rebase、Cherry-Pick、Revert。
• Git Blame： 从编辑器行号菜单开关注释，使用时间背景色并在悬浮时显示完整信息。
• 可选 AI 消息： 通过用户自己的 OpenAI-compatible 服务，根据本次选中变更生成提交信息。

快速开始

1. 打开包含 Git 仓库的工作区。
2. 在 Activity Bar 选择 Git4VSC。
3. 勾选本次提交的文件，双击文件检查 Diff。
4. 输入提交信息，然后选择 Commit 或 Commit and Push。
5. 在 Push 前检查待推送提交和文件。

按 Alt+3 打开或关闭 Commit Log。点击状态栏分支名打开仓库与分支操作菜单；点击相邻的 Commit Log 图标只切换日志面板。

常用操作

仓库状态反馈

Commit 标题、分支列表和状态栏都会显示 ahead/behind 数量。长时间操作会在不引起文件列表跳动的位置显示进度，完成后通过短提示报告已更新、已推送或已经是最新状态等结果。

AI 与隐私

打开 Git4VSC Settings → AI 配置 Base URL、API Key、模型、语言和额外指令。API Key 保存在 VS Code SecretStorage；只有用户主动生成时才会发送本次选中变更的上下文。扩展不包含遥测。

Preview 当前范围

• 支持整文件和 Git Change Block 部分提交；暂不支持逐行选择和持久 Changelist。
• 可以创建 Worktree，暂不提供完整的 Worktree 管理页面。
• Commit Log 支持按路径筛选，暂不提供独立且跟踪重命名的 File History 页面。
• Git Stash 已可用；Shelf 和 Interactive Rebase 暂未包含。

运行要求

• Visual Studio Code 1.102.0 或更高版本。
• Extension Host 可访问 Git 2.23 或更高版本。
• 当前本地或远程工作区已经打开 Git 仓库。

Feedback / 反馈

• Source repository / 源码仓库
• Report an issue / 反馈问题

Git4VSC is an independent project and is not affiliated with or endorsed by JetBrains s.r.o. or Microsoft Corporation. Git4VSC 是独立项目，与 JetBrains s.r.o. 或 Microsoft Corporation 不存在隶属或背书关系。