diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-09 12:09:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-09 12:09:10 -0800 |
| commit | 4f3929275b6ce975f80e00a2decfc4ab734a8ead (patch) | |
| tree | a6c4bd27e8880c2eeb04d228e3815d9d24ff927f /builtin | |
| parent | 6176ee2349ae9b4c54948e86fb8de4b9fd4f0c94 (diff) | |
| parent | 6f5ca70580444e61231ad33de0aac81d2420d523 (diff) | |
| download | git-4f3929275b6ce975f80e00a2decfc4ab734a8ead.tar.xz | |
Merge branch 'sb/doc-worktree-prune-expire-improvement'
The help text and the documentation for the "--expire" option of
"git worktree [list|prune]" have been improved.
* sb/doc-worktree-prune-expire-improvement:
worktree: clarify that --expire only affects missing worktrees
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/worktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index fbdaf2eb2e..3d6547c23b 100644 --- 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 working trees older than <time>")), + N_("prune missing working trees older than <time>")), OPT_END() }; @@ -1070,7 +1070,7 @@ static int list(int ac, const char **av, const char *prefix, OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")), OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")), OPT_EXPIRY_DATE(0, "expire", &expire, - N_("add 'prunable' annotation to worktrees older than <time>")), + N_("add 'prunable' annotation to missing worktrees older than <time>")), OPT_SET_INT('z', NULL, &line_terminator, N_("terminate records with a NUL character"), '\0'), OPT_END() |