diff options
| -rw-r--r-- | Command/DropKey.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/git-annex-dropkey.mdwn | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Command/DropKey.hs b/Command/DropKey.hs index 71993acbb..15d5403a8 100644 --- a/Command/DropKey.hs +++ b/Command/DropKey.hs @@ -13,7 +13,7 @@ import Logs.Location import Annex.Content cmd :: Command -cmd = noCommit $ +cmd = noCommit $ withGlobalOptions [jsonOption] $ command "dropkey" SectionPlumbing "drops annexed content for specified keys" (paramRepeating paramKey) diff --git a/debian/changelog b/debian/changelog index 59ac9a51b..671ce9504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ git-annex (6.20160230) UNRELEASED; urgency=medium Thanks, Klaus Ethgen. * Added dependencies on haskell mountpoints and disk-free-space libraries, removing FFI code from git-annex. - * dropkey: Add --batch. + * dropkey: Add --batch and --json. -- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400 diff --git a/doc/git-annex-dropkey.mdwn b/doc/git-annex-dropkey.mdwn index 03f03ec4e..0107ab538 100644 --- a/doc/git-annex-dropkey.mdwn +++ b/doc/git-annex-dropkey.mdwn @@ -24,6 +24,11 @@ exist; using it can easily result in data loss. Enables batch mode, in which lines containing keys to drop are read from stdin. +* `--json` + + Enable JSON output. This is intended to be parsed by programs that use + git-annex. Each line of output is a JSON object. + # SEE ALSO [[git-annex]](1) |