Set Zed git.diff_base to merge-base for branch-wide gutters
Zed v1.15.0 adds git.diff_base so gutters, file-status colors, and git: diff can show all branch changes vs the default-branch merge base instead of only uncommitted vs HEAD—pair it with JSX/TSX linked editing and Emmet-in-returns.
Why this loop
Default HEAD-only diffs hide the full branch delta while you iterate on a PR. Configuring git.diff_base to the merge-base view makes editor gutters and file-status colors match review scope. Web teams also gain linked editing for custom elements in JSX/TSX and Emmet completions inside return/arrow-function bodies, cutting rename and markup friction. Drag-out from the Project Panel (macOS/Linux Wayland) speeds handoff to external tools without leaving Zed.
Proposed actions
- In Zed settings.json, set "git.diff_base": "merge_base" (or the release’s equivalent value for default-branch merge base) so gutters, file-status colors, and git: diff show all current-branch changes against the default branch’s merge base instead of only uncommitted vs HEAD.
- Open a feature-branch file with both committed and uncommitted edits, run the git: diff command, and confirm the gutter/status colors reflect the full branch delta; switch git.diff_base back to HEAD briefly to verify the two modes.
- In a .tsx/.jsx file that uses a custom element, rename the opening tag and confirm linked editing updates the closing tag; in a component return and an arrow-function body, trigger Emmet abbreviations and accept completions.
- On macOS or Linux Wayland, drag a file from the Project Panel into an external app (Finder/Files, browser, Slack, etc.) to confirm OS drag-out works for your handoff path.
- If you use multi-cursor edits, bind a distinct action under the new multiple_selections key context so multi-selection mode does not reuse single-selection chords.
Agent prompt
Paste into your agent or query via MCP (`get_agent_prompt`) — free, no extra AI costPaste into Claude Code / CLAUDE.md task
# DevAgentRadar → Claude Code You are helping me adopt a real coding-assistant change. Work only from the facts below. Do not invent features. ## Context Assistant: Zed AI Proposal: Set Zed git.diff_base to merge-base for branch-wide gutters Summary: Zed v1.15.0 adds git.diff_base so gutters, file-status colors, and git: diff can show all branch changes vs the default-branch merge base instead of only uncommitted vs HEAD—pair it with JSX/TSX linked editing and Emmet-in-returns. Primary source: https://github.com/zed-industries/zed/releases/tag/v1.15.0 ## Why it matters Default HEAD-only diffs hide the full branch delta while you iterate on a PR. Configuring git.diff_base to the merge-base view makes editor gutters and file-status colors match review scope. Web teams also gain linked editing for custom elements in JSX/TSX and Emmet completions inside return/arrow-function bodies, cutting rename and markup friction. Drag-out from the Project Panel (macOS/Linux Wayland) speeds handoff to external tools without leaving Zed. ## Suggested actions 1. In Zed settings.json, set "git.diff_base": "merge_base" (or the release’s equivalent value for default-branch merge base) so gutters, file-status colors, and git: diff show all current-branch changes against the default branch’s merge base instead of only uncommitted vs HEAD. 2. Open a feature-branch file with both committed and uncommitted edits, run the git: diff command, and confirm the gutter/status colors reflect the full branch delta; switch git.diff_base back to HEAD briefly to verify the two modes. 3. In a .tsx/.jsx file that uses a custom element, rename the opening tag and confirm linked editing updates the closing tag; in a component return and an arrow-function body, trigger Emmet abbreviations and accept completions. 4. On macOS or Linux Wayland, drag a file from the Project Panel into an external app (Finder/Files, browser, Slack, etc.) to confirm OS drag-out works for your handoff path. 5. If you use multi-cursor edits, bind a distinct action under the new multiple_selections key context so multi-selection mode does not reuse single-selection chords. ## Config surfaces this release may change - MCP servers — check your repo before applying ## Your job 1. Restate the change in one sentence. 2. Propose a minimal plan for my repo (or a throwaway pilot). 3. Implement only what I approve; prefer small diffs and tests. 4. Call out risks (permissions, breaking APIs, cost). Start by confirming you understood the proposal.
Your loop
This browser · no sign-in · not shared as “you”Your decision stays on this device. A public tally appears after a few votes.