diff --git a/manual/src/full---help-output.md b/manual/src/full---help-output.md
index cbced7821..6974c64a9 100644
--- a/manual/src/full---help-output.md
+++ b/manual/src/full---help-output.md
@@ -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"]
 
@@ -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]
 
@@ -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]
 
diff --git a/src/cli.rs b/src/cli.rs
index 544b25ceb..a88915792 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -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(