aboutsummaryrefslogtreecommitdiff
path: root/CmdLine
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-01-30 12:46:42 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-01-30 12:46:42 -0400
commitf81280a6e378b4350252ee68a897d4399dd9d2ac (patch)
treefb375b5ee46a58ef74ce6565ec0f7a5057d043f1 /CmdLine
parent2555d17ab99029795bb89164a10139546f3aa6c4 (diff)
Remove -j short option for --json-progress; that option was already taken for --json.
This commit was sponsored by Trenton Cronholm.
Diffstat (limited to 'CmdLine')
-rw-r--r--CmdLine/GitAnnex/Options.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
index 92724d03d..f0d00981b 100644
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -294,7 +294,7 @@ jsonOption = globalFlag (Annex.setOutput (JSONOutput False))
jsonProgressOption :: GlobalOption
jsonProgressOption = globalFlag (Annex.setOutput (JSONOutput True))
- ( long "json-progress" <> short 'j'
+ ( long "json-progress"
<> help "include progress in JSON output"
<> hidden
)