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
Zed v1.15.0 introduces git.diff_base so editor gutters, file-status colors, and git: diff can show either uncommitted changes vs HEAD ("head", default) or the full current-branch delta vs the repository default-branch merge base ("default_branch"). That is the PR-review surface, not just dirty-tree coloring, and the same toggle is in the editor controls menu as Diff Against Default Branch. Independently, gutter.git_gutter_width sizes those gutter indicators. Frontend work in the same release gets linked editing for custom JSX/TSX elements and Emmet completions inside return and arrow-function bodies. Twenty additional changes were omitted from this signal—do not invent extra settings from them. Put merge-base mode in shared settings if the team already reviews against the default branch.
Proposed actions
- In the user or workspace Zed settings JSON, set "git.diff_base": "default_branch" so gutters, file-status colors, and the git: diff command show all current-branch changes against the default-branch merge base instead of only uncommitted changes vs HEAD.
- Open a dirty file on a feature branch, then choose Diff Against Default Branch in the editor controls menu and confirm gutters and git: diff match merge-base review; if indicators are cramped, also set "gutter.git_gutter_width" to a wider pixel value in the same settings file.
- In a .jsx or .tsx file, rename a custom element opening tag and confirm linked editing updates the matching close tag; in a component return or arrow-function body, type an Emmet abbreviation and accept the completion.
- If you use multi-cursor workflows, add keymap entries that use the new multiple_selections key context so those bindings apply only when more than one selection is active.
Agent prompt
Paste into your agent or query via MCP (get_agent_prompt) — free, no extra AI costAGENTS.md / CLAUDE.md / GEMINI.md rule update
DevAgentRadar → Repo Harness Rule Patch
Goal: update our repository's permanent harness instructions based on this release.
Update the file that tool actually reads. Do not dump everything into one file.
- Claude Code → CLAUDE.md plus
.claude/(skills, hooks, settings, agents, commands). It does not read AGENTS.md natively; start CLAUDE.md with@AGENTS.md. - Codex, Copilot, Cursor, Factory Droid, Grok Build, Roo Code, Goose, OpenCode, Amp, Zed, Aider → AGENTS.md.
- Gemini CLI / Antigravity → GEMINI.md. AGENTS.md only if
context.fileNameis set. - Cursor glob-scoped rules →
.cursor/rules/*.mdc(plain.mdis ignored), not a second constitution. - Codex MCP →
.codex/config.toml, not.mcp.json. - Copilot extra instructions →
.github/copilot-instructions.md; custom agents →.github/agents/. - Windsurf →
.windsurf/rules(do not assume AGENTS.md). - Cline →
.clinerules. - Procedures → a skill (
SKILL.md). Enforcement the model must not skip → a hook. Isolated roles → subagents. - Do not fork the same rule into three tool files.
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
Zed v1.15.0 introduces git.diff_base so editor gutters, file-status colors, and git: diff can show either uncommitted changes vs HEAD ("head", default) or the full current-branch delta vs the repository default-branch merge base ("default_branch"). That is the PR-review surface, not just dirty-tree coloring, and the same toggle is in the editor controls menu as Diff Against Default Branch. Independently, gutter.git_gutter_width sizes those gutter indicators. Frontend work in the same release gets linked editing for custom JSX/TSX elements and Emmet completions inside return and arrow-function bodies. Twenty additional changes were omitted from this signal—do not invent extra settings from them. Put merge-base mode in shared settings if the team already reviews against the default branch.
Suggested actions
- In the user or workspace Zed settings JSON, set "git.diff_base": "default_branch" so gutters, file-status colors, and the git: diff command show all current-branch changes against the default-branch merge base instead of only uncommitted changes vs HEAD.
- Open a dirty file on a feature branch, then choose Diff Against Default Branch in the editor controls menu and confirm gutters and git: diff match merge-base review; if indicators are cramped, also set "gutter.git_gutter_width" to a wider pixel value in the same settings file.
- In a .jsx or .tsx file, rename a custom element opening tag and confirm linked editing updates the matching close tag; in a component return or arrow-function body, type an Emmet abbreviation and accept the completion.
- If you use multi-cursor workflows, add keymap entries that use the new multiple_selections key context so those bindings apply only when more than one selection is active.
Config surfaces this release may change
- MCP servers — check your repo before applying
After you finish
Do not report this as applied to DevAgentRadar. You cannot write the visitor's loop.
Tell the human: open https://devagentradar.com/proposals/zed-ai-v1-15-0-set-zed-git-diff-base-to-merge-base-for-branch-wide-gutte and mark Applied, Skipped, or Failed. Proposal id: 464a31e3-089f-4845-a05e-5a2963a4062f
Instructions:
- Read the existing context files and settings for the tools in this repo.
- Draft an explicit Git diff. Update ONLY agent harness rules or tool configuration.
- Call out deprecated flags, obsolete habits, or changed permission boundaries.
- Do not touch application logic.
Start with the proposed diff and say which layer and which tool's file it belongs in.
Your loop
This browser · no sign-in · not shared as “you”After you run the prompt
Only you can mark this. Agents cannot write your loop.
Your decision stays on this device. A public tally appears after a few votes.