diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | CmdLine/GitAnnex/Options.hs | 2 | ||||
| -rw-r--r-- | doc/bugs/clash_of_-j__in_copy_for_--json_--json-progress.mdwn | 3 |
3 files changed, 6 insertions, 1 deletions
@@ -3,6 +3,8 @@ git-annex (6.20170102) UNRELEASED; urgency=medium * Increase default cost for p2p remotes from 200 to 1000. This makes git-annex prefer transferring data from special remotes when possible. + * Remove -j short option for --json-progress; that option was already + taken for --json. -- Joey Hess <id@joeyh.name> Fri, 06 Jan 2017 15:22:06 -0400 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 ) diff --git a/doc/bugs/clash_of_-j__in_copy_for_--json_--json-progress.mdwn b/doc/bugs/clash_of_-j__in_copy_for_--json_--json-progress.mdwn index dddcf90d8..43988d94d 100644 --- a/doc/bugs/clash_of_-j__in_copy_for_--json_--json-progress.mdwn +++ b/doc/bugs/clash_of_-j__in_copy_for_--json_--json-progress.mdwn @@ -13,3 +13,6 @@ $> git annex copy --help """]] [[!meta author=yoh]] + +> Removed the short -j for --json-progress, I don't think that +> needs a short option. [[done]] --[[Joey]] |