diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-11-25 12:29:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-25 12:29:45 +0900 |
| commit | 058c36aa261d0cc7e2d7dfa26ad151eb322e3cd6 (patch) | |
| tree | 1264045043ca50f56fb85deed8ec8e94541ac5e8 | |
| parent | fd78021b91902dd85d07bedbd040ea057c6ffeba (diff) | |
| parent | b8139c8f4e761bd24f4ffc3170203e82c75165e2 (diff) | |
| download | git-058c36aa261d0cc7e2d7dfa26ad151eb322e3cd6.tar.gz | |
Merge branch 'kh/checkout-ignore-other-docfix' into maint-2.47
Doc updates.
* kh/checkout-ignore-other-docfix:
checkout: refer to other-worktree branch, not ref
| -rw-r--r-- | Documentation/git-checkout.txt | 8 | ||||
| -rw-r--r-- | builtin/checkout.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 8bdfa54ab0..bf26655764 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -290,10 +290,10 @@ Note that this option uses the no overlay mode by default (see also `--overlay`), and currently doesn't support overlay mode. --ignore-other-worktrees:: - `git checkout` refuses when the wanted ref is already checked - out by another worktree. This option makes it check the ref - out anyway. In other words, the ref can be held by more than one - worktree. + `git checkout` refuses when the wanted branch is already checked + out or otherwise in use by another worktree. This option makes + it check the branch out anyway. In other words, the branch can + be in use by more than one worktree. --overwrite-ignore:: --no-overwrite-ignore:: 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); |