Skip to content
Proposals/Set Zed git.diff_base to merge-base for branch-w
proposaldeveloperP5High impactZed AI

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

  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.

Agent prompt

Paste into your agent or query via MCP (`get_agent_prompt`) — free, no extra AI cost

Paste 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.
agentmcpmodelpricingideRelease source ↗

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.

Originating release signal

Zed AIv1.15.0Aug 12, 2026

v1.15.0

This week's release includes a new `git.diff_base` setting for choosing whether editor gutters, file-status colors, and `git: diff` show uncommitted changes against `HEAD` or all current-branch changes against the default branch's merge base, plus support for dragging files from the Project Panel to external apps on macOS and Linux Wayland; web developers also get linked editing for custom elements in JSX and TSX and Emmet completions in return and arrow-function bodies. · +59 more changes

Verified excerpt — the source's own words
This week's release includes a new `git.diff_base` setting for choosing whether editor gutters, file-status colors, and `git: diff` show uncommitted changes against `HEAD` or all current-branch changes against the default branch's merge base, plus support for dragging files from the Project Panel to external apps on macOS and Linux Wayland; web developers also get linked editing for custom elements in JSX and TSX and Emmet completions in return and arrow-function bodies.

## Shipped by the Zed Guild 🛡️

- Added support for dragging files from the Project Panel to external macOS apps. ([#58161](https://github.com/zed-industries/zed/pull/58161); thanks [notJoon](https://github.com/notJoon))
- Added the `multiple_selections` key context for assigning different keybindings when multiple selections are active. ([#60018](https://github.com/zed-industries/zed/pull/60018); thanks [AidanV](https://github.com/AidanV))
- Agent: Fixed the first line of terminal output sometimes being hidden in the Agent Panel. ([#61939](https://github.com/zed-industries/zed/pull/61939); thanks [timvermeulen](https://github.com/timvermeulen))

Excerpt ends here — this release continues at the source ↗.

Primary source ↗