dandavison/delta
1
0
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2026-10-11 21:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document support for box ul style (#2118)

Browse Source
This commit is contained in:
Justin Su
2026-10-04 20:00:43 -04:00
committed by Dan Davison
parent 83284d7edd
commit 3c2269c6b8
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manual/src/full---help-output.md
+9 -8
View File
@@ -91,8 +91,8 @@ Options:
Style string for the commit hash decoration.
See STYLES section. The style string should contain one of the
special attributes 'box', 'ul' (underline), 'ol' (overline), or the
combination 'ul ol'.
special attributes 'box', 'ul' (underline), 'ol' (overline), or a
combination ('ul ol' or 'box ul').
[default: ""]
@@ -214,8 +214,8 @@ Options:
Style string for the file decoration.
See STYLES section. The style string should contain one of the
special attributes 'box', 'ul' (underline), 'ol' (overline), or the
combination 'ul ol'.
special attributes 'box', 'ul' (underline), 'ol' (overline), or a
combination ('ul ol' or 'box ul').
[default: "blue ul"]
@@ -322,8 +322,8 @@ Options:
Style string for the hunk-header decoration.
See STYLES section. The style string should contain one of the
special attributes 'box', 'ul' (underline), 'ol' (overline), or the
combination 'ul ol'.
special attributes 'box', 'ul' (underline), 'ol' (overline), or a
combination ('ul ol' or 'box ul').
[default: "blue box"]
@@ -573,7 +573,8 @@ Options:
This styles the decoration of the header above the diff between the
ancestral commit and the 'ours' branch. See STYLES section. The
style string should contain one of the special attributes 'box',
'ul' (underline), 'ol' (overline), or the combination 'ul ol'.
'ul' (underline), 'ol' (overline), or a combination ('ul ol' or 'box
ul').
[default: box]
@@ -592,7 +593,7 @@ Options:
This styles the decoration of the header above the diff between the
ancestral commit and 'their' branch. See STYLES section. The style
string should contain one of the special attributes 'box', 'ul'
(underline), 'ol' (overline), or the combination 'ul ol'.
(underline), 'ol' (overline), or a combination ('ul ol' or 'box ul').
[default: box]
src/cli.rs
+5 -5
View File
@@ -115,7 +115,7 @@ pub struct Opt {
/// Style string for the commit hash decoration.
///
/// See STYLES section. The style string should contain one of the special attributes 'box',
/// 'ul' (underline), 'ol' (overline), or the combination 'ul ol'.
/// 'ul' (underline), 'ol' (overline), or a combination ('ul ol' or 'box ul').
pub commit_decoration_style: String,
#[arg(
@@ -238,7 +238,7 @@ pub struct Opt {
/// Style string for the file decoration.
///
/// See STYLES section. The style string should contain one of the special attributes 'box',
/// 'ul' (underline), 'ol' (overline), or the combination 'ul ol'.
/// 'ul' (underline), 'ol' (overline), or a combination ('ul ol' or 'box ul').
pub file_decoration_style: String,
#[arg(
@@ -363,7 +363,7 @@ pub struct Opt {
/// Style string for the hunk-header decoration.
///
/// See STYLES section. The style string should contain one of the special attributes 'box',
/// 'ul' (underline), 'ol' (overline), or the combination 'ul ol'.
/// 'ul' (underline), 'ol' (overline), or a combination ('ul ol' or 'box ul').
pub hunk_header_decoration_style: String,
#[arg(
@@ -646,7 +646,7 @@ pub struct Opt {
///
/// This styles the decoration of the header above the diff between the ancestral commit and the
/// 'ours' branch. See STYLES section. The style string should contain one of the special
/// attributes 'box', 'ul' (underline), 'ol' (overline), or the combination 'ul ol'.
/// attributes 'box', 'ul' (underline), 'ol' (overline), or a combination ('ul ol' or 'box ul').
pub merge_conflict_ours_diff_header_decoration_style: String,
#[arg(
@@ -668,7 +668,7 @@ pub struct Opt {
///
/// This styles the decoration of the header above the diff between the ancestral commit and
/// 'their' branch. See STYLES section. The style string should contain one of the special
/// attributes 'box', 'ul' (underline), 'ol' (overline), or the combination 'ul ol'.
/// attributes 'box', 'ul' (underline), 'ol' (overline), or a combination ('ul ol' or 'box ul').
pub merge_conflict_theirs_diff_header_decoration_style: String,
#[arg(