Skip to content

Document support for box ul style #2118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
injust wants to merge 1 commit into from
+14 −13
Closed

Document support for box ul style #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions manual/src/full---help-output.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ]

Expand Down Expand Up @@ -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"]

Expand Down Expand Up @@ -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"]

Expand Down Expand Up @@ -576,7 +576,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]

Expand All @@ -595,7 +596,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]

Expand Down
10 changes: 5 additions & 5 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down
Loading