Ma Git

English | 中文

English

A VS Code extension that brings an IntelliJ IDEA-like Git branch browsing and diffing experience to the Source Control (SCM) panel.

Features

• Branch Browser (BRANCHES): Browse branches and tags as a tree in the SCM panel.
  • The current branch (HEAD) is always pinned to the top.
  • Local: list of local branches.
  • Remotes: remote branches grouped by remote, with multi-remote support.
  • Tags: tags grouped into local and remote, clearly separated; remote tags support multiple remotes and include tags that have not been fetched locally yet.
• Branch / Tag actions: right-click to check out, create a new branch from it, compare with the current branch, view commit history, diff against the working tree, delete, and more.
• Push: push a local branch to a configured remote, or push to all remotes at once (Push to All Remotes).
• Pull: pull a remote branch into the current branch using rebase or merge.
• Rebase / Merge: rebase or merge the selected branch into the current branch.
• Diff (Changed Files): when comparing two branches / commits / tags, all changed files are listed (added / modified / deleted); a single click opens the native diff view. Folder chains that only contain a single sub-folder are compacted IntelliJ-style (e.g. src/main/java/com/example), so deep paths no longer waste indentation.
• Branch Graph: open the Branch Graph from the Branches view title bar (the $(git-branch) button) to see a family-tree of branches (local + remote-tracking) rendered as an SVG node-link diagram, showing which branch each one forked from. Only branches active within the last magit.branchGraph.commitDepth commits are drawn, keeping large repos readable; hover a node for its tip and fork point.
• Commit history and comparison: view the commit history of any branch / tag and run two-way commit comparison in a centralized Compare panel; commit rows are annotated with merge, tag, branch and other information.
• Git command log: every git command triggered by the extension and every user action is logged to the Ma Git channel in the Output panel for easy troubleshooting.

Usage

1. Install Ma Git from the Marketplace.
2. Open any Git repository and locate the BRANCHES view in the Source Control panel in the sidebar.
3. Expand Local / Remotes / Tags and right-click a node to use the corresponding action.

Screenshots

• local-branch-menu

• remote-branch-menu
  

• branch-compare
  

Contact

Questions and suggestions are welcome — please open an Issue on the Marketplace page.
EMail: majj888@foxmail.com

中文

VS Code 扩展，在源代码管理（SCM）面板中提供类 IntelliJ IDEA 的 Git 分支浏览与差异对比体验。

功能特性

• 分支浏览器（BRANCHES）：在 SCM 面板中以树形结构浏览分支与标签。
  • 当前分支（HEAD）置顶显示。
  • Local：本地分支列表。
  • Remotes：按远程仓库分组展示远程分支，支持多远程。
  • Tags：标签按本地与远程分组展示，本地标签与远程标签清晰区分，远程标签支持多远程、并包含本地尚未拉取到的标签。
• 分支 / 标签操作：右键即可进行检出、基于其新建分支、与当前分支对比、查看提交记录、与工作区对比差异、删除等。
• 推送：支持将本地分支推送到已配置的远程，也支持一次性推送到所有远程（Push to All Remotes）。
• 拉取：支持将远程分支以 rebase 或 merge 方式拉取到当前分支。
• 变基 / 合并：支持将所选分支 rebase / merge 到当前分支。
• 差异对比（Changed Files）：对比两个分支 / 提交 / 标签时，列出变更文件（新增 / 修改 / 删除），单击即可打开原生差异视图。仅含单个子文件夹的目录链会按 IntelliJ 风格合并为一段（如 src/main/java/com/example），深层路径不再浪费缩进。
• 分支关系图：在 Branches 视图标题栏点击分支图按钮（$(git-branch)）打开分支家族树，以 SVG 节点连线图展示各分支（本地 + 远程跟踪）从哪个分支分叉而来；仅绘制最近 magit.branchGraph.commitDepth 个提交内活跃的分支，便于大仓库阅读，悬停节点可看 tip 与分叉点。
• 提交记录与对比：可查看任意分支 / 标签的提交历史，并在集中式 Compare 面板中进行双向提交对比；提交行会标注 merge、tag、branch 等信息。
• Git 命令日志：所有扩展触发的 git 命令及用户操作都会记录到 Output 面板的 Ma Git 频道，便于排查。

使用方式

1. 在扩展市场安装 Ma Git。
2. 打开任意 Git 仓库，在侧边栏 源代码管理 面板中找到 BRANCHES 视图。
3. 展开 Local / Remotes / Tags，右键节点即可使用相应功能。

效果图

• local-branch-menu

• remote-branch-menu
  

• branch-compare
  

联系作者

如有问题或建议，欢迎在插件市场提交 Issue 反馈。
EMail: majj888@foxmail.com