From e0fa3032eceaf2caa1776369b57d6792cf7ddba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?= Date: Fri, 30 May 2025 13:18:15 +0200 Subject: [PATCH] docs: Properly nest the docs for the inline git blame settings (#31739) From a report on [discord](https://discord.com/channels/869392257814519848/873292398204170290/1377943171320774656): reorders the docs for the inline git blame feature so they are properly nested. Screenshot_2025-05-30_at_11 32 17 Release Notes: - N/A --- docs/src/configuring-zed.md | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md index 6688f4004bbe7a01257e52a9ae9da7c037818db9..9f988869b28790bb21b33565d762433867e89ed8 100644 --- a/docs/src/configuring-zed.md +++ b/docs/src/configuring-zed.md @@ -1753,91 +1753,91 @@ Example: } ``` -### Hunk Style +**Options** -- Description: What styling we should use for the diff hunks. -- Setting: `hunk_style` -- Default: +1. Disable inline git blame: ```json { "git": { - "hunk_style": "staged_hollow" + "inline_blame": { + "enabled": false + } } } ``` -**Options** - -1. Show the staged hunks faded out and with a border: +2. Only show inline git blame after a delay (that starts after cursor stops moving): ```json { "git": { - "hunk_style": "staged_hollow" + "inline_blame": { + "enabled": true, + "delay_ms": 500 + } } } ``` -2. Show unstaged hunks faded out and with a border: +3. Show a commit summary next to the commit date and author: ```json { "git": { - "hunk_style": "unstaged_hollow" + "inline_blame": { + "enabled": true, + "show_commit_summary": true + } } } ``` -**Options** - -1. Disable inline git blame: +4. Use this as the minimum column at which to display inline blame information: ```json { "git": { "inline_blame": { - "enabled": false + "enabled": true, + "min_column": 80 } } } ``` -2. Only show inline git blame after a delay (that starts after cursor stops moving): +### Hunk Style + +- Description: What styling we should use for the diff hunks. +- Setting: `hunk_style` +- Default: ```json { "git": { - "inline_blame": { - "enabled": true, - "delay_ms": 500 - } + "hunk_style": "staged_hollow" } } ``` -3. Show a commit summary next to the commit date and author: +**Options** + +1. Show the staged hunks faded out and with a border: ```json { "git": { - "inline_blame": { - "enabled": true, - "show_commit_summary": true - } + "hunk_style": "staged_hollow" } } ``` -4. Use this as the minimum column at which to display inline blame information: +2. Show unstaged hunks faded out and with a border: ```json { "git": { - "inline_blame": { - "enabled": true, - "min_column": 80 - } + "hunk_style": "unstaged_hollow" } } ```