Merge branch 'stable-6.2' into stable-6.3

* stable-6.2:
  Introduce core.trustPackedRefsStat config
  Fix documentation for core.trustFolderStat

Change-Id: I48b6c095ac62dc859829d6fef45325accbb0a144

diff --cc org.eclipse.jgit/.settings/.api_filters
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391,28bc2a810d8a78a022ac8f7f75360cff815ae238..f0c98e4b7022f2c0c1c93217bd62312ebc7d68ef
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,0 -1,110 +1,175 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <component id="org.eclipse.jgit" version="2">
+     <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.13.2"/>
+                 <message_argument value="SHA1_IMPLEMENTATION"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="6.1.1"/>
+                 <message_argument value="CONFIG_KEY_TRUST_PACKED_REFS_STAT"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/lib/CoreConfig.java" type="org.eclipse.jgit.lib.CoreConfig$TrustPackedRefsStat">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="6.1.1"/>
+                 <message_argument value="TrustPackedRefsStat"/>
+             </message_arguments>
+         </filter>
+     </resource>
++    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="workTreeUpdater"/>
++            </message_arguments>
++        </filter>
++        <filter id="338755678">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="builder"/>
++            </message_arguments>
++        </filter>
++        <filter id="338755678">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="implicitDirCache"/>
++            </message_arguments>
++        </filter>
++        <filter id="338755678">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="toBeCheckedOut"/>
++            </message_arguments>
++        </filter>
++        <filter id="338755678">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="toBeDeleted"/>
++            </message_arguments>
++        </filter>
++        <filter id="338755678">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="workingTreeOptions"/>
++            </message_arguments>
++        </filter>
++        <filter id="338792546">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="addCheckoutMetadata(Map&lt;String,DirCacheCheckout.CheckoutMetadata&gt;, String, Attributes)"/>
++            </message_arguments>
++        </filter>
++        <filter id="338792546">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
++                <message_argument value="cleanUp()"/>
++            </message_arguments>
++        </filter>
++    </resource>
++    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger$WorkTreeUpdater">
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="6.3.1"/>
++                <message_argument value="WorkTreeUpdater"/>
++            </message_arguments>
++        </filter>
++    </resource>
+     <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4">
+         <filter id="1109393411">
+             <message_arguments>
+                 <message_argument value="5.13.1"/>
+                 <message_argument value="org.eclipse.jgit.transport.AwsRequestSignerV4"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.13.1"/>
+                 <message_argument value="urlEncode(String, boolean)"/>
+             </message_arguments>
+         </filter>
+     </resource>
++    <resource path="src/org/eclipse/jgit/util/Paths.java" type="org.eclipse.jgit.util.Paths">
++        <filter id="337768515">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.util.Paths"/>
++            </message_arguments>
++        </filter>
++    </resource>
+     <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1">
+         <filter id="337764418">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="digest()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="digest(MutableObjectId)"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="hasCollision()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="reset()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="setDetectCollision(boolean)"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="toObjectId()"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="update(byte)"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="update(byte[])"/>
+             </message_arguments>
+         </filter>
+         <filter id="421650549">
+             <message_arguments>
+                 <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
+                 <message_argument value="update(byte[], int, int)"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1$Sha1Implementation">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.13.2"/>
+                 <message_argument value="Sha1Implementation"/>
+             </message_arguments>
+         </filter>
+     </resource>
+ </component>