Skip to content
Proposals/Set git.diff_base to default-branch merge base i
proposaldeveloperP5High impactZed AI

Set git.diff_base to default-branch merge base in Zed

Zed v1.15.0-pre adds git.diff_base so gutters, file-status colors, and git: diff can show the full branch delta vs the default-branch merge base instead of only uncommitted changes vs HEAD. Configure it and align multi-select/JSX workflows with the other shipped edits.

Why this loop

Feature-branch work is easier when the editor surfaces the entire branch change set, not just the working-tree delta. This pre-release’s git.diff_base setting controls whether gutters, status colors, and git: diff compare against HEAD or against the default branch’s merge base—so setting it once changes how you read every dirty file. Pair that with the new multiple_selections key context for multi-cursor bindings, and (for web apps) linked editing on custom JSX/TSX elements plus Emmet inside return/arrow-function bodies, to cut rename and markup friction without leaving Zed. Drag-out from the Project Panel on macOS/Linux Wayland is available when you need a quick handoff to an external app.

Proposed actions

  1. Open Zed settings.json and set the git.diff_base option so editor gutters, file-status colors, and `git: diff` show all current-branch changes against the default branch’s merge base rather than only uncommitted changes against HEAD.
  2. On a feature branch with commits ahead of main/master, open a touched file and run `git: diff`; confirm gutters and status colors reflect the full branch-vs-merge-base delta after the setting change.
  3. In keymap.json, add a binding that uses the new `multiple_selections` key context so a different chord applies when multiple selections are active (e.g. a multi-cursor-only surround or delete).
  4. In a .jsx/.tsx buffer, rename a custom element’s opening tag and confirm linked editing updates the matching tag; in a return or arrow-function body, trigger Emmet abbreviation expansion to verify completions work there.
  5. On macOS or Linux Wayland, drag a file from the Project Panel onto an external app (browser, design tool, or terminal) to confirm OS drag-out works for quick handoffs.

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 git.diff_base to default-branch merge base in Zed
Summary: Zed v1.15.0-pre adds git.diff_base so gutters, file-status colors, and git: diff can show the full branch delta vs the default-branch merge base instead of only uncommitted changes vs HEAD. Configure it and align multi-select/JSX workflows with the other shipped edits.
Primary source: https://github.com/zed-industries/zed/releases/tag/v1.15.0-pre

## Why it matters
Feature-branch work is easier when the editor surfaces the entire branch change set, not just the working-tree delta. This pre-release’s git.diff_base setting controls whether gutters, status colors, and git: diff compare against HEAD or against the default branch’s merge base—so setting it once changes how you read every dirty file. Pair that with the new multiple_selections key context for multi-cursor bindings, and (for web apps) linked editing on custom JSX/TSX elements plus Emmet inside return/arrow-function bodies, to cut rename and markup friction without leaving Zed. Drag-out from the Project Panel on macOS/Linux Wayland is available when you need a quick handoff to an external app.

## Suggested actions
1. Open Zed settings.json and set the git.diff_base option so editor gutters, file-status colors, and `git: diff` show all current-branch changes against the default branch’s merge base rather than only uncommitted changes against HEAD.
2. On a feature branch with commits ahead of main/master, open a touched file and run `git: diff`; confirm gutters and status colors reflect the full branch-vs-merge-base delta after the setting change.
3. In keymap.json, add a binding that uses the new `multiple_selections` key context so a different chord applies when multiple selections are active (e.g. a multi-cursor-only surround or delete).
4. In a .jsx/.tsx buffer, rename a custom element’s opening tag and confirm linked editing updates the matching tag; in a return or arrow-function body, trigger Emmet abbreviation expansion to verify completions work there.
5. On macOS or Linux Wayland, drag a file from the Project Panel onto an external app (browser, design tool, or terminal) to confirm OS drag-out works for quick handoffs.

## 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”

Community signal · 0 approved · 0 deferred · 0 ignored

Anonymous public tally (one vote per visitor; changing choice updates your vote). Not moderated product truth.

Originating release signal

Zed AIv1.15.0-preAug 5, 2026

v1.15.0-pre

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. · +58 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 ↗