Merge branch 'master' into symlink-missing

diff --cc CHANGELOG
index a143664a1ce79bd69617fad8a16dddcd212be434,3b6aa86d272c0d640ea87214fd1583bbc90302b5..9489507055b677964b313af4b5911b3d3414b87e
--- 1/CHANGELOG
--- 2/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.