From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 16 Nov 2020 14:03:12 +0000 (-0400)
Subject: Merge branch 'master' into symlink-missing
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~102^2~73
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=26cf26caca2c1c48fa7dc99fd74e16832721a975;p=git-annex.git

Merge branch 'master' into symlink-missing
---

26cf26caca2c1c48fa7dc99fd74e16832721a975
diff --cc CHANGELOG
index a143664a1c,3b6aa86d27..9489507055
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,4 -1,11 +1,14 @@@
- git-annex (8.20201104) UNRELEASED; urgency=medium
+ git-annex (8.20201117) UNRELEASED; urgency=medium
+ 
++  * adjust: New --unlock-present mode which locks files whose content is not
++    present (so the broken symlink is visible), while unlocking files whose
++    content is present.
+   * examinekey: Added a "file" format variable for consistency with find,
+     and for easier scripting.
+ 
+  -- Joey Hess <id@joeyh.name>  Mon, 16 Nov 2020 09:38:32 -0400
+ 
+ git-annex (8.20201116) upstream; urgency=medium
  
    * move: Fix a regression in the last release that made move --to not
      honor numcopies settings.