aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
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 /CHANGELOG
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 'CHANGELOG')
-rw-r--r--CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a7a1d8ee8..16601dfea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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