worktree: use 'prune' instead of 'expire' in help text

Use 'prune' instead of 'expire' when describing the --expire option's
effect on missing worktrees, since the terminology is clearer.

Signed-off-by: Sam Bostock <sam@sambostock.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-worktree.adoc b/Documentation/git-worktree.adoc
index 402d363064433721ba8f904ca4321244f2160547..29b43925f35bd0cd51ea281548a59152fd7b2b70 100644 (file)
--- a/Documentation/git-worktree.adoc
+++ b/Documentation/git-worktree.adoc
@@ -271,7 +271,7 @@ mismatch, even if the links are correct.
 With `list`, output additional information about worktrees (see below).
 
 `--expire <time>`::
-       With `prune`, only expire missing worktrees older than _<time>_.
+       With `prune`, only prune missing worktrees if older than _<time>_.
 +
 With `list`, annotate missing worktrees as prunable if they are older than
 _<time>_.

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 07d7986292a49eb7e71720e7e1082029b7abaaa6..2b84028fea13b9c64a5bdf17ad15f3c8c57e2617 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -252,7 +252,7 @@ static int prune(int ac, const char **av, const char *prefix,
                OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
                OPT__VERBOSE(&verbose, N_("report pruned working trees")),
                OPT_EXPIRY_DATE(0, "expire", &expire,
-                               N_("expire missing working trees older than <time>")),
+                               N_("prune missing working trees older than <time>")),
                OPT_END()
        };