aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2018-02-26 14:10:03 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2018-02-26 14:10:03 -0400
commit4f274998c0c39102ea9dff6fa9bef3127478ca66 (patch)
tree6833e3a01c4163704abd15cdbaa8e205e6a88a3d /CHANGELOG
parent27b7de929fbdd8bde934d098ea47c418f688c464 (diff)
fix sync bug in direct mode
sync: Fix bug that prevented pulling changes into direct mode repositories that were committed to remotes using git commit rather than git-annex sync. This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6246c46a1..d663815ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,9 @@ git-annex (6.20180113) UNRELEASED; urgency=medium
can be used to disable automatic merge of git-annex branches.
* tips/automatically_adding_metadata/pre-commit-annex: Fix to not
silently skip filenames containing non-ascii characters.
+ * sync: Fix bug that prevented pulling changes into direct mode
+ repositories that were committed to remotes using git commit
+ rather than git-annex sync.
-- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400