diff options
Diffstat (limited to 'CmdLine/GitAnnex/Options.hs')
-rw-r--r-- | CmdLine/GitAnnex/Options.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index 6965e8e51..9f033aa4d 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -200,8 +200,8 @@ fileMatchingOptions' = "match files smaller than a size" ] -parseCombiningOptions :: Parser [GlobalSetter] -parseCombiningOptions = +combiningOptions :: Parser [GlobalSetter] +combiningOptions = many $ longopt "not" "negate next option" <|> longopt "and" "both previous and next option must match" <|> longopt "or" "either previous or next option must match" @@ -211,8 +211,8 @@ parseCombiningOptions = longopt o h = globalFlag (Limit.addToken o) ( long o <> help h ) shortopt o h = globalFlag (Limit.addToken [o]) ( short o <> help h) -parseJsonOption :: Parser GlobalSetter -parseJsonOption = globalFlag (Annex.setOutput JSONOutput) +jsonOption :: Parser GlobalSetter +jsonOption = globalFlag (Annex.setOutput JSONOutput) ( long "json" <> short 'j' <> help "enable JSON output" ) |