From f81280a6e378b4350252ee68a897d4399dd9d2ac Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 30 Jan 2017 12:46:42 -0400
Subject: Remove -j short option for --json-progress; that option was already
 taken for --json.

This commit was sponsored by Trenton Cronholm.
---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'CHANGELOG')

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
 
-- 
cgit v1.2.3