aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2018-02-19 14:03:23 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2018-02-19 14:12:15 -0400
commit0366c6eac698327ced9c63e241a9474a5c2a7e20 (patch)
tree6ca01bda2e500396154a4fa9b473fa3cc9bc193d /CHANGELOG
parentef1a5a1f9b85de7261ac9a27bede3dedda88fb45 (diff)
fix --json-progress --json to be same as --json --json-progress
Fix behavior of --json-progress followed by --json, in which the latter option disabled the former. This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7d75e70d1..204004a60 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium
hopefully hackage finally recognises that OS.
* Split Test.hs and avoid optimising it much, to need less memory to
compile.
+ * Fix behavior of --json-progress followed by --json, in which
+ the latter option disabled the former.
-- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400