dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-05 04:17:21 +03:00
Code Issues Projects Releases Wiki Activity

Remove mention of 'underoverline' from help text

Browse Source 
This has never been supported in a released version of delta: use 'ul ol' instead.
This commit is contained in:
Dan Davison 2020-07-04 10:29:48 -04:00
parent cfbe381104
commit 2756428be0
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -502,20 +502,23 @@ OPTIONS:
Style (foreground, background, attributes) for the commit hash line. See STYLES section [default:
raw]
--commit-decoration-style <commit-decoration-style>
Style (foreground, background, attributes) for the commit hash decoration. See STYLES section. One of the
special attributes 'box', 'ul', 'overline', or 'underoverline' must be given [default: ]
Style (foreground, background, attributes) 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' [default: ]
--file-style <file-style>
Style (foreground, background, attributes) for the file section. See STYLES section [default: blue]
--file-decoration-style <file-decoration-style>
Style (foreground, background, attributes) for the file decoration. See STYLES section. One of the special
attributes 'box', 'ul', 'overline', or 'underoverline' must be given [default: blue ul]
Style (foreground, background, attributes) 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' [default: blue ul]
--hunk-header-style <hunk-header-style>
Style (foreground, background, attributes) for the hunk-header. See STYLES section [default: syntax]
--hunk-header-decoration-style <hunk-header-decoration-style>
Style (foreground, background, attributes) for the hunk-header decoration. See STYLES section. One of the
special attributes 'box', 'ul', 'overline', or 'underoverline' must be given [default: blue box]
Style (foreground, background, attributes) 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' [default: blue box]
--word-diff-regex <tokenization-regex>
The regular expression used to decide what a word is for the within-line highlight algorithm. For less fine-
grained matching than the default try --word-diff-regex="\S+" --max-line-distance=1.0 (this is more
@ -540,7 +543,7 @@ OPTIONS:
--line-numbers-right-format <line-numbers-right-format>
Format string for the right column of line numbers. A typical value would be "{np:^4}│ " which means to
display the line numbers of the plus file (new version), followed by a dividing character, and a space. See
the LINE NUMBERS section [default: {np:^4}│ ]
the LINE NUMBERS section [default: {np:^4}│]
--line-numbers-left-style <line-numbers-left-style>
Style (foreground, background, attributes) for the left column of line numbers. See STYLES and LINE NUMBERS
sections [default: auto]
@ -780,9 +783,9 @@ For example, the default value of --line-numbers-left-format is '{nm:^4}⋮'. Th
left column should display the minus line number (nm), center-aligned, padded with spaces to a
width of 4 characters, followed by a unicode dividing-line character (⋮).
Similarly, the default value of --line-numbers-right-format is '{np:^4}│ '. This means that the
Similarly, the default value of --line-numbers-right-format is '{np:^4}│'. This means that the
right column should display the plus line number (np), center-aligned, padded with spaces to a
width of 4 characters, followed by a unicode dividing-line character (│), and a space.
width of 4 characters, followed by a unicode dividing-line character (│).
Use '<' for left-align, '^' for center-align, and '>' for right-align.

15
src/cli.rs
View File

@ -64,7 +64,7 @@ https://git-scm.com/docs/git-config#Documentation/git-config.txt-color
Here is an example:
--minus-style 'red bold ul #ffeeee'
--minus-style 'red bold ul \"#ffeeee\"'
That means: For removed lines, set the foreground (text) color to 'red', make it bold and
underlined, and set the background color to '#ffeeee'.
@ -317,8 +317,8 @@ pub struct Opt {
#[structopt(long = "commit-decoration-style", default_value = "")]
/// Style (foreground, background, attributes) for the commit hash decoration. See STYLES
/// section. One of the special attributes 'box', 'ul', 'overline', or 'underoverline' must be
/// given.
/// section. The style string should contain one of the special attributes 'box', 'ul'
/// (underline), 'ol' (overline), or the combination 'ul ol'.
pub commit_decoration_style: String,
#[structopt(long = "file-style", default_value = "blue")]
@ -326,8 +326,9 @@ pub struct Opt {
pub file_style: String,
#[structopt(long = "file-decoration-style", default_value = "blue ul")]
/// Style (foreground, background, attributes) for the file decoration. See STYLES section. One
/// of the special attributes 'box', 'ul', 'overline', or 'underoverline' must be given.
/// Style (foreground, background, attributes) 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'.
pub file_decoration_style: String,
#[structopt(long = "hunk-header-style", default_value = "syntax")]
@ -336,8 +337,8 @@ pub struct Opt {
#[structopt(long = "hunk-header-decoration-style", default_value = "blue box")]
/// Style (foreground, background, attributes) for the hunk-header decoration. See STYLES
/// section. One of the special attributes 'box', 'ul', 'overline', or 'underoverline' must be
/// given.
/// section. The style string should contain one of the special attributes 'box', 'ul'
/// (underline), 'ol' (overline), or the combination 'ul ol'.
pub hunk_header_decoration_style: String,
/// The regular expression used to decide what a word is for the within-line highlight