Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 5600ec3f6165ae04682f30481142452438f856af..21d2bedcc930ab216f2a55ec90ba188b2b66dfce 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -8,8 +8,8 @@ static int all_attrs;
 static int cached_attrs;
 static int stdin_paths;
 static const char * const check_attr_usage[] = {
-N_("git check-attr [-a | --all | attr...] [--] pathname..."),
-N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
+N_("git check-attr [-a | --all | <attr>...] [--] <pathname>..."),
+N_("git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>"),
 NULL
 };