mirror of
https://github.com/git/git.git
synced 2026-08-13 17:07:54 +00:00
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
This commit is contained in:
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user