From 3f6cf805797114ad108a898cedfe3539519e9475 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Fri, 31 May 2024 08:38:33 +0200 Subject: [PATCH] fixup! Show divergence from base branch in branches list --- docs/Config.md | 1 + pkg/config/user_config.go | 1 + schema/config.json | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/Config.md b/docs/Config.md index a131cc3b5da..a43d78b6170 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -163,6 +163,7 @@ gui: commitHashLength: 8 # Whether to show the divergence from the base branch in the branches view. + # One of: 'none' | 'onlyArrow' | 'arrowAndNumber' showDivergenceFromBaseBranch: none # Height of the command log view diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index f45647a6271..0658aa3acda 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -128,6 +128,7 @@ type GuiConfig struct { // If true, show commit hashes alongside branch names in the branches view. ShowBranchCommitHash bool `yaml:"showBranchCommitHash"` // Whether to show the divergence from the base branch in the branches view. + // One of: 'none' | 'onlyArrow' | 'arrowAndNumber' ShowDivergenceFromBaseBranch string `yaml:"showDivergenceFromBaseBranch" jsonschema:"enum=none,enum=onlyArrow,enum=arrowAndNumber"` // Height of the command log view CommandLogSize int `yaml:"commandLogSize" jsonschema:"minimum=0"` diff --git a/schema/config.json b/schema/config.json index 2b1b31341f1..8e0efd42f7e 100644 --- a/schema/config.json +++ b/schema/config.json @@ -326,7 +326,7 @@ "onlyArrow", "arrowAndNumber" ], - "description": "Whether to show the divergence from the base branch in the branches view.", + "description": "Whether to show the divergence from the base branch in the branches view.\nOne of: 'none' | 'onlyArrow' | 'arrowAndNumber'", "default": "none" }, "commandLogSize": {