Merge branch 'maint'

* maint:
config: Change output of --get-regexp for valueless keys
config: Complete documentation of --get-regexp
cleanup merge-base test script
Fix zero-object version-2 packs
Ignore submodule commits when fetching over dumb protocols

diff --cc Documentation/git-config.txt
Simple merge

diff --cc fetch.c
index dda33e548b65e79e22de8a84ab4d67ef13387a05,6f1f420be26ac6dafec366b3dc0671fb7f4940dc..811be87a3c1e0d14d9f2b37650d56575b49caa22
--- 1/fetch.c
--- 2/fetch.c
+++ b/fetch.c
@@@ -46,6 -46,9 +46,9 @@@ static int process_tree(struct tree *tr
        while (tree_entry(&desc, &entry)) {
                struct object *obj = NULL;
  
 -              if (S_ISDIRLNK(entry.mode))
+               /* submodule commits are not stored in the superproject */
++              if (S_ISGITLINK(entry.mode))
+                       continue;
                if (S_ISDIR(entry.mode)) {
                        struct tree *tree = lookup_tree(entry.sha1);
                        if (tree)

diff --cc sha1_file.c
Simple merge

diff --cc t/t1300-repo-config.sh
Simple merge