Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1

diff --git a/builtin/add.c b/builtin/add.c
index e664100c7122d6c4116763716c2260756feffac2..632594768d9ee7d723a35377ab4cff9cf714a0d9 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -16,7 +16,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;