Merge branch 'jc/maint-push-refspec-default-doc' into maint

diff --git a/builtin/add.c b/builtin/add.c
index 7738025a2e56ea3fbd256666998040981360e5ab..ab1c9e8fb7a0f7c6f60cc78ff0f345838210459a 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -17,7 +17,7 @@
 #include "bulk-checkin.h"
 
 static const char * const builtin_add_usage[] = {
-       N_("git add [options] [--] <filepattern>..."),
+       N_("git add [options] [--] <pathspec>..."),
        NULL
 };
 static int patch_interactive, add_interactive, edit_interactive;
@@ -328,9 +328,9 @@ static void warn_pathless_add(const char *option_name, const char *short_name) {
         * this is not the original behavior and can't be
         * changed until users trained themselves not to type
         * "git add -u" or "git add -A". For now, we warn and
-        * keep the old behavior. Later, this warning can be
-        * turned into a die(...), and eventually we may
-        * reallow the command with a new behavior.
+        * keep the old behavior. Later, the behavior can be changed
+        * to tree-wide, keeping the warning for a while, and
+        * eventually we can drop the warning.
         */
        warning(_("The behavior of 'git add %s (or %s)' with no path argument from a\n"
                  "subdirectory of the tree will change in Git 2.0 and should not be used anymore.\n"