summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 21:06:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-23 21:06:54 (GMT)
commit640b07fda32223fd586db56325f939b614342e3e (patch)
tree326bea3fddbe3c8f082e70b625225df781e5d315
parentbc2e02044c9780fe3f78d9eafb6efb2f00a937c7 (diff)
parent54b4d125d5981826d9e14e47216acabf29108f9f (diff)
downloadgit-640b07fda32223fd586db56325f939b614342e3e.zip
git-640b07fda32223fd586db56325f939b614342e3e.tar.gz
git-640b07fda32223fd586db56325f939b614342e3e.tar.bz2
Merge branch 'bs/ls-files-opt-help-text-update' into jch
Help test for "ls-files" options have been updated. * bs/ls-files-opt-help-text-update: ls-files: use imperative mood for -X and -z option description
-rw-r--r--builtin/ls-files.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index ec19bf5..a2000ed 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -612,7 +612,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
struct option builtin_ls_files_options[] = {
/* Think twice before adding "--nul" synonym to this */
OPT_SET_INT('z', NULL, &line_terminator,
- N_("paths are separated with NUL character"), '\0'),
+ N_("separate paths with the NUL character"), '\0'),
OPT_BOOL('t', NULL, &show_tag,
N_("identify the file status with tags")),
OPT_BOOL('v', NULL, &show_valid_bit,
@@ -649,7 +649,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
N_("skip files matching pattern"),
PARSE_OPT_NONEG, option_parse_exclude),
OPT_CALLBACK_F('X', "exclude-from", &dir, N_("file"),
- N_("exclude patterns are read from <file>"),
+ N_("read exclude patterns from <file>"),
PARSE_OPT_NONEG, option_parse_exclude_from),
OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
N_("read additional per-directory exclude patterns in <file>")),