summaryrefslogtreecommitdiff
path: root/CmdLine/GitAnnex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-04 13:45:34 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-04 13:45:34 -0400
commit1933f8a5599f33b95811710ad10e1ed17703699d (patch)
treeacf454abe167051a7ff77a752deb6c5b9f45a758 /CmdLine/GitAnnex
parentc3a372f8f500f6b88d467af42df6332836d8dd31 (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 2651b92e4..06e04748d 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"