summaryrefslogtreecommitdiff
path: root/CmdLine/GitAnnex
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2015-11-04 13:45:34 -0400
committerJoey Hess <joeyh@joeyh.name>2015-11-04 13:45:34 -0400
commit4fd03ccd7b6161d0639f532781dc5b6963ef49b9 (patch)
treec6559106fe955af85eac8e73a1c4d33cbfe1c841 /CmdLine/GitAnnex
parent30e39592b4ae093c29f7215b96ce25863552e78a (diff)
concurrent-output, first pass
Output without -Jn should be unchanged from before. With -Jn, concurrent-output is used for messages, but regions are not used yet, so it's a mess.
Diffstat (limited to 'CmdLine/GitAnnex')
-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 2651b92e48..06e04748d7 100644
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -283,7 +283,7 @@ jsonOption = globalFlag (Annex.setOutput JSONOutput)
)
jobsOption :: GlobalOption
-jobsOption = globalSetter (Annex.setOutput . ParallelOutput) $
+jobsOption = globalSetter (Annex.setOutput . ConcurrentOutput) $
option auto
( long "jobs" <> short 'J' <> metavar paramNumber
<> help "enable concurrent jobs"