diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:59:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:59:34 -0700 |
| commit | b61f55be0060ab47b154d979f919dd969f29d314 (patch) | |
| tree | 3566700e4b8f8d992d9e599b7a933473a3139ea9 /builtin | |
| parent | 26f4f2c74e2632b708ba3dd4ae2e69d359878ccd (diff) | |
| parent | 5805853f228acafe1d45edeef780cd1b00b952aa (diff) | |
| download | git-b61f55be0060ab47b154d979f919dd969f29d314.tar.gz git-b61f55be0060ab47b154d979f919dd969f29d314.tar.xz | |
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')
| -rw-r--r-- | builtin/check-attr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/check-attr.c b/builtin/check-attr.c index e1ff575da..075d01d30 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 }; |