Re: [PATCH 2/3] checkout: add --ignore-other-wortrees
From: Mark Levedahl <hidden>
Date: 2016-06-15 23:03:23
On 01/03/2015 04:41 AM, Nguyễn Thái Ngọc Duy wrote:
quoted hunk ↗ jump to hunk
Noticed-by: Mark Levedahl [off-list ref] Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- Documentation/git-checkout.txt | 6 ++++++ builtin/checkout.c | 6 +++++- t/t2025-checkout-to.sh | 7 +++++++ 3 files changed, 18 insertions(+), 1 deletion(-)diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 0c13825..52eaa48 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt@@ -232,6 +232,12 @@ section of linkgit:git-add[1] to learn how to operate the `--patch` mode. specific files such as HEAD, index... See "MULTIPLE WORKING TREES" section for more information. +--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. +
Thanks for adding this, I haven't had a chance to test but by reading this solves the problem I raised. Mark