On 01/03/2015 04:41 AM, Nguyễn Thái Ngọc Duy wrote:
Noticed-by: Mark Levedahl <[email protected]>
Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
  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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to