Merge branch 'stable-6.6' into stable-6.7

* stable-6.6:
  Introduce a PriorityQueue sorting RevCommits by commit timestamp
  Remove org.eclipse.jgit.benchmark/.factorypath
  Update jmh to 1.37 for org.eclipse.jgit.benchmark

Change-Id: I76ebca527e523f124bfe81c821169c790eddccb6

diff --cc Documentation/config-options.md
Simple merge

diff --cc org.eclipse.jgit/.settings/.api_filters
index a6aff1bf856d1968549b9c3a0e938fba45e82bc0,a6aff1bf856d1968549b9c3a0e938fba45e82bc0..277e9ce3a5d6136d0f736baeeda76ee18ad1727d
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -16,37 -16,37 +16,31 @@@
              </message_arguments>
          </filter>
      </resource>
--    <resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException">
++    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
          <filter id="1142947843">
              <message_arguments>
--                <message_argument value="5.9.1"/>
--                <message_argument value="isPermanent()"/>
++                <message_argument value="5.13.3"/>
++                <message_argument value="CONFIG_KEY_PACK_KEPT_OBJECTS"/>
              </message_arguments>
          </filter>
          <filter id="1142947843">
              <message_arguments>
--                <message_argument value="5.9.1"/>
--                <message_argument value="setPermanent(boolean)"/>
++                <message_argument value="5.13.3"/>
++                <message_argument value="CONFIG_REPACK_SECTION"/>
              </message_arguments>
          </filter>
      </resource>
--    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
--        <filter id="1142947843">
++    <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
++        <filter id="388100214">
              <message_arguments>
--                <message_argument value="5.13.2"/>
--                <message_argument value="CONFIG_KEY_SKIPHASH"/>
++                <message_argument value="org.eclipse.jgit.lib.Constants"/>
++                <message_argument value="COMMIT_GENERATION_NOT_COMPUTED"/>
              </message_arguments>
          </filter>
--        <filter id="1142947843">
++        <filter id="388100214">
              <message_arguments>
--                <message_argument value="5.13.3"/>
--                <message_argument value="CONFIG_KEY_PACK_KEPT_OBJECTS"/>
--            </message_arguments>
--        </filter>
--        <filter id="1142947843">
--            <message_arguments>
--                <message_argument value="5.13.3"/>
--                <message_argument value="CONFIG_REPACK_SECTION"/>
++                <message_argument value="org.eclipse.jgit.lib.Constants"/>
++                <message_argument value="COMMIT_GENERATION_UNKNOWN"/>
              </message_arguments>
          </filter>
      </resource>
@@@ -58,14 -58,14 +52,6 @@@
              </message_arguments>
          </filter>
      </resource>
--    <resource path="src/org/eclipse/jgit/revwalk/RevCommit.java" type="org.eclipse.jgit.revwalk.RevCommit">
--        <filter id="1193279491">
--            <message_arguments>
--                <message_argument value="6.5.1"/>
--                <message_argument value="buffer"/>
--            </message_arguments>
--        </filter>
--    </resource>
      <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
          <filter id="336658481">
              <message_arguments>
@@@ -73,12 -73,12 +59,6 @@@
                  <message_argument value="DEFAULT_PACK_KEPT_OBJECTS"/>
              </message_arguments>
          </filter>
--        <filter id="336658481">
--            <message_arguments>
--                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
--                <message_argument value="DEFAULT_WRITE_REVERSE_INDEX"/>
--            </message_arguments>
--        </filter>
          <filter id="1142947843">
              <message_arguments>
                  <message_argument value="5.13.3"/>

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java
Simple merge