From: "Sam Bostock via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Eric Sunshine <sunshine@sunshineco•com>,
Sam Bostock <sam.bostock@shopify•com>,
Sam Bostock <sam.bostock@shopify•com>
Subject: [PATCH v2 2/2] worktree: use 'prune' instead of 'expire' in help text
Date: Fri, 19 Dec 2025 18:16:09 +0000 [thread overview]
Message-ID: <ff4732b72a0d8c97c668167308039918362ffb9c.1766168169.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2135.v2.git.git.1766168169.gitgitgadget@gmail.com>
From: Sam Bostock <sam.bostock@shopify•com>
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>
---
Documentation/git-worktree.adoc | 2 +-
builtin/worktree.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-worktree.adoc b/Documentation/git-worktree.adoc
index 402d363064..29b43925f3 100644
--- 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 82fcbfeccf..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 missing working trees older than <time>")),
+ N_("prune missing working trees older than <time>")),
OPT_END()
};
--
gitgitgadget
next prev parent reply other threads:[~2025-12-19 18:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-19 15:00 [PATCH] worktree: clarify --expire applies to missing worktrees Sam Bostock via GitGitGadget
2025-12-19 15:11 ` Eric Sunshine
2025-12-20 5:44 ` Junio C Hamano
2025-12-20 7:14 ` Eric Sunshine
2025-12-20 7:31 ` Junio C Hamano
2025-12-20 8:23 ` Eric Sunshine
2025-12-19 18:16 ` [PATCH v2 0/2] " Sam Bostock via GitGitGadget
2025-12-19 18:16 ` [PATCH v2 1/2] " Sam Bostock via GitGitGadget
2025-12-20 6:07 ` Junio C Hamano
2025-12-19 18:16 ` Sam Bostock via GitGitGadget [this message]
2025-12-20 6:11 ` [PATCH v2 2/2] worktree: use 'prune' instead of 'expire' in help text Junio C Hamano
2026-01-21 19:55 ` [PATCH v2 0/2] worktree: clarify --expire applies to missing worktrees Junio C Hamano
2026-01-28 5:39 ` [PATCH v3] worktree: clarify that --expire only affects " Sam Bostock via GitGitGadget
2026-01-30 0:29 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ff4732b72a0d8c97c668167308039918362ffb9c.1766168169.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sam.bostock@shopify$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox