summaryrefslogtreecommitdiff
path: root/GitAnnex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-18 18:21:42 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-18 18:21:42 -0400
commitb9aa944b09e60badb99c65a87f5689e0ab9010e3 (patch)
treef7e72ecc47114f95a8989501b5935306ac2ebe7f /GitAnnex.hs
parent8a5a92480b9dcf691af1e8c4849cb71c4158b845 (diff)
add --and --or --not -( and -)
I dislike -( and -), but without using a different option parser, can't easily use bare parens. --and and --or will become more useful once there are more interesting limits than --exclude
Diffstat (limited to 'GitAnnex.hs')
-rw-r--r--GitAnnex.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs
index bb0f85119..68c7a1805 100644
--- a/GitAnnex.hs
+++ b/GitAnnex.hs
@@ -98,8 +98,6 @@ options = commonOptions ++
"specify to where to transfer content"
, Option ['f'] ["from"] (ReqArg setfrom paramRemote)
"specify from where to transfer content"
- , Option ['x'] ["exclude"] (ReqArg (Limit.exclude) paramGlob)
- "skip files matching the glob pattern"
, Option ['N'] ["numcopies"] (ReqArg setnumcopies paramNumber)
"override default number of copies"
, Option [] ["trust"] (ReqArg (Remote.forceTrust Trusted) paramRemote)
@@ -110,7 +108,9 @@ options = commonOptions ++
"override trust setting to untrusted"
, Option ['c'] ["config"] (ReqArg setgitconfig "NAME=VALUE")
"override git configuration setting"
- ]
+ , Option ['x'] ["exclude"] (ReqArg (Limit.exclude) paramGlob)
+ "skip files matching the glob pattern"
+ ] ++ matcherOptions
where
setto v = Annex.changeState $ \s -> s { Annex.toremote = Just v }
setfrom v = Annex.changeState $ \s -> s { Annex.fromremote = Just v }