Merge branch 'maint'

diff --git a/builtin/add.c b/builtin/add.c
index 7738025a2e56ea3fbd256666998040981360e5ab..0dd014eb96110e46e79fd6bad0bab843551fab79 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;