Merge branch 'maint' into HEAD

diff --git a/builtin-gc.c b/builtin-gc.c
index f99b212ca47b13741c1e087b6ec75b9861c11e38..3a2ca4f901b985c45820c8a5f68061cf1c647f30 100644 (file)
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -206,9 +206,9 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                if (!need_to_gc())
                        return 0;
                fprintf(stderr, "Packing your repository for optimum "
-                       "performance. If you would rather run\n"
-                       "\"git gc\" by hand, run \"git config gc.auto 0\" "
-                       "to disable automatic cleanup.\n");
+                       "performance. You may also\n"
+                       "run \"git gc\" manually. See "
+                       "\"git help gc\" for more information.\n");
        } else {
                /*
                 * Use safer (for shared repos) "-A" option to