summaryrefslogtreecommitdiff
path: root/builtin/check-attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-17 22:59:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-17 22:59:34 (GMT)
commitb61f55be0060ab47b154d979f919dd969f29d314 (patch)
tree3566700e4b8f8d992d9e599b7a933473a3139ea9 /builtin/check-attr.c
parent26f4f2c74e2632b708ba3dd4ae2e69d359878ccd (diff)
parent5805853f228acafe1d45edeef780cd1b00b952aa (diff)
downloadgit-b61f55be0060ab47b154d979f919dd969f29d314.zip
git-b61f55be0060ab47b154d979f919dd969f29d314.tar.gz
git-b61f55be0060ab47b154d979f919dd969f29d314.tar.bz2
Merge branch 'maint'
* maint: t/perf: add "trash directory" to .gitignore Add missing -z to git check-attr usage text for consistency with man page git-jump: ignore (custom) prefix in diff mode Documentation: indent-with-non-tab uses "equivalent tabs" not 8 completion: add --no-edit to git-commit
Diffstat (limited to 'builtin/check-attr.c')
-rw-r--r--builtin/check-attr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index e1ff575..075d01d 100644
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -9,7 +9,7 @@ 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 [-a | --all | attr...] < <list-of-paths>"),
+N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"),
NULL
};