summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2021-01-11 21:52:32 -0400
committerJoey Hess <joeyh@joeyh.name>2021-01-11 21:52:32 -0400
commitad48349741384ed0e49fab9cf13ac7f90aba0dd1 (patch)
tree6b8c894ce1057d069f89e7209c266f00ea43ec66 /CHANGELOG
parentb3e72e94efbce652f25fb99d6c6ace8beb2a52d4 (diff)
downloadgit-repair-ad48349741384ed0e49fab9cf13ac7f90aba0dd1.tar.gz
Merge from git-annex.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c3b43a4..f38d6b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-repair (1.20210111) UNRELEASED; urgency=medium
+
+ * Merge from git-annex.
+
+ -- Joey Hess <id@joeyh.name> Mon, 11 Jan 2021 21:52:06 -0400
+
git-repair (1.20200504) unstable; urgency=medium
* Fix a few documentation typos.