summaryrefslogtreecommitdiffstats
path: root/src/cli.rs
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2020-07-04 10:29:48 -0400
committerDan Davison <dandavison7@gmail.com>2020-07-04 10:36:21 -0400
commit2756428be01c1a5148b78745d7239786b27ecb3f (patch)
treecae0a5f1dae1692e4fe273246b6e9afca0dd7c59 /src/cli.rs
parentcfbe3811042475cb2cbab27e494f44f652eff32d (diff)
Remove mention of 'underoverline' from help text
This has never been supported in a released version of delta: use 'ul ol' instead.
Diffstat (limited to 'src/cli.rs')
-rw-r--r--src/cli.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/cli.rs b/src/cli.rs
index 0800274d..f9dfdb83 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -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