aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-06-06 12:57:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-06-06 12:57:27 -0400
commit954898841c332833dd1b2e40d745fd5ce4caf41d (patch)
tree10c1c550ce8bfa973ce759402e37dce8fde252e6 /CHANGELOG
parentca671b4e1004bfcdb28c7de15d5936e90b6e7682 (diff)
Avoid error about git-annex-shell not being found when syncing with -J with a git remote where git-annex-shell is not installed.
This commit was sponsored by andrea rota.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d85926d70..6ace216f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,9 @@ git-annex (6.20170520) UNRELEASED; urgency=medium
disable the usual automatic merge conflict resolution done by git-annex
sync and the assistant.
* sync: Added --no-resolvemerge option.
+ * Avoid error about git-annex-shell not being found when
+ syncing with -J with a git remote where git-annex-shell is not
+ installed.
-- Joey Hess <id@joeyh.name> Wed, 24 May 2017 14:03:40 -0400