@@ -40,7 +40,6 @@ impl App {
4040 .global_setting(AppSettings::DeriveDisplayOrder)
4141 .global_setting(AppSettings::UnifiedHelpMessage)
4242 .global_setting(AppSettings::NextLineHelp)
43− .global_setting(AppSettings::AllArgsOverrideSelf)
4443 .setting(AppSettings::InferSubcommands)
4544 .setting(AppSettings::ArgsNegateSubcommands)
4645 .setting(AppSettings::DisableHelpSubcommand)
@@ -55,6 +54,7 @@ impl App {
5554 Arg::with_name("language")
5655 .short("l")
5756 .long("language")
57+ .overrides_with("language")
5858 .help("Set the language for highlighting")
5959 .long_help(
6060 "Set the language for syntax highlighting. The language can be \
@@ -96,6 +96,7 @@ impl App {
9696 .arg(
9797 Arg::with_name("color")
9898 .long("color")
99+ .overrides_with("color")
99100 .takes_value(true)
100101 .value_name("when")
101102 .possible_values(&["auto", "never", "always"])
@@ -105,6 +106,7 @@ impl App {
105106 .arg(
106107 Arg::with_name("paging")
107108 .long("paging")
109+ .overrides_with("paging")
108110 .takes_value(true)
109111 .value_name("when")
110112 .possible_values(&["auto", "never", "always"])
@@ -115,6 +117,7 @@ impl App {
115117 .arg(
116118 Arg::with_name("wrap")
117119 .long("wrap")
120+ .overrides_with("wrap")
118121 .takes_value(true)
119122 .value_name("mode")
120123 .possible_values(&["character", "never"])
@@ -130,6 +133,7 @@ impl App {
130133 .arg(
131134 Arg::with_name("theme")
132135 .long("theme")
136+ .overrides_with("theme")
133137 .takes_value(true)
134138 .help("Set the theme for highlighting")
135139 .long_help(
@@ -146,6 +150,7 @@ impl App {
146150 .arg(
147151 Arg::with_name("number")
148152 .long("number")
153+ .overrides_with("number")
149154 .short("n")
150155 .conflicts_with("style")
151156 .help("Show line numbers (alias for '--style=numbers')")