Merge branch 'maint'

* maint:
remote: create fetch config lines with '+'
push: allow unqualified dest refspecs to DWIM
doc/git-gc: add a note about what is collected
t5516: remove ambiguity test (1)
Linked glossary from cvs-migration page
write-tree: properly detect failure to write tree objects

diff --combined builtin-remote.c
index a3ee1ac3937b179799fbaa048927c4c8a9963cc9,4149f3b3ce4bed091200fdff539e459aa39fb06d..93bb84e1d4c762c6c049276202ebc2320447e9c8
--- 1/builtin-remote.c
--- 2/builtin-remote.c
+++ b/builtin-remote.c
@@@ -19,8 -19,6 +19,8 @@@ static const char * const builtin_remot
  
  static int verbose;
  
 +static int show_all(void);
 +
  static inline int postfixcmp(const char *string, const char *postfix)
  {
        int len1 = strlen(string), len2 = strlen(postfix);
@@@ -107,6 -105,7 +107,7 @@@ static int add(int argc, const char **a
                struct path_list_item *item = track.items + i;
  
                strbuf_reset(&buf2);
+               strbuf_addch(&buf2, '+');
                if (mirror)
                        strbuf_addf(&buf2, "refs/%s:refs/%s",
                                        item->path, item->path);
@@@ -386,11 -385,8 +387,11 @@@ static int show_or_prune(int argc, cons
  
        argc = parse_options(argc, argv, options, builtin_remote_usage, 0);
  
 -      if (argc < 1)
 +      if (argc < 1) {
 +              if (!prune)
 +                      return show_all();
                usage_with_options(builtin_remote_usage, options);
 +      }
  
        memset(&states, 0, sizeof(states));
        for (; argc; argc--, argv++) {