diff options
| author | Kristoffer Haugsbakk <code@khaugsbakk.name> | 2024-10-10 20:39:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-10 13:09:13 -0700 |
| commit | b8139c8f4e761bd24f4ffc3170203e82c75165e2 (patch) | |
| tree | 5777e975a7d4d91b1a0f9177ec4600c9fafef38c /builtin/checkout.c | |
| parent | Git 2.47 (diff) | |
| download | git-b8139c8f4e761bd24f4ffc3170203e82c75165e2.tar.gz git-b8139c8f4e761bd24f4ffc3170203e82c75165e2.zip | |
checkout: refer to other-worktree branch, not ref
We can only check out commits or branches, not refs in general. And the
problem here is if another worktree is using the branch that we want to
check out.
Let’s be more direct and just talk about branches instead of refs.
Also replace “be held” with “in use”. Further, “in use” is not
restricted to a branch being checked out (e.g. the branch could be busy
on a rebase), hence generalize to “or otherwise in use” in the option
description.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 9c30000d3a..c449558e66 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1716,7 +1716,7 @@ static struct option *add_common_switch_branch_options( N_("update ignored files (default)"), PARSE_OPT_NOCOMPLETE), OPT_BOOL(0, "ignore-other-worktrees", &opts->ignore_other_worktrees, - N_("do not check if another worktree is holding the given ref")), + N_("do not check if another worktree is using this branch")), OPT_END() }; struct option *newopts = parse_options_concat(prevopts, options); |