All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Levedahl <mlevedahl@gmail.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Max Kirillov <max@max630.net>,
	Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH 2/3] checkout: add --ignore-other-wortrees
Date: Sun, 04 Jan 2015 22:50:20 -0500	[thread overview]
Message-ID: <54AA09FC.7080707@gmail.com> (raw)
In-Reply-To: <1420278087-14613-3-git-send-email-pclouds@gmail.com>

On 01/03/2015 04:41 AM, Nguyễn Thái Ngọc Duy wrote:
> Noticed-by: Mark Levedahl <mlevedahl@gmail.com>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>   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

  reply	other threads:[~2015-01-05  3:50 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-03  9:41 [PATCH 0/3] nd/multiple-work-trees updates Nguyễn Thái Ngọc Duy
2015-01-03  9:41 ` [PATCH 1/3] checkout: pass whole struct to parse_branchname_arg instead of individual flags Nguyễn Thái Ngọc Duy
2015-01-03  9:41 ` [PATCH 2/3] checkout: add --ignore-other-wortrees Nguyễn Thái Ngọc Duy
2015-01-05  3:50   ` Mark Levedahl [this message]
2015-01-03  9:41 ` [PATCH 3/3] git-checkout.txt: a note about multiple checkout support for submodules Nguyễn Thái Ngọc Duy
2015-01-05  3:43   ` Mark Levedahl
2015-01-06 21:30   ` Max Kirillov
2015-02-12 22:57 ` [PATCH 0/3] nd/multiple-work-trees updates Junio C Hamano
2015-02-12 23:51   ` Jens Lehmann
2015-02-13  3:17     ` Mark Levedahl
2015-02-13  9:10   ` Dennis Kaarsemaker
2015-02-13 10:14   ` Duy Nguyen
2015-03-18  8:04 ` Ephrim Khong
2015-03-18  8:23   ` Duy Nguyen

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=54AA09FC.7080707@gmail.com \
    --to=mlevedahl@gmail.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=max@max630.net \
    --cc=pclouds@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.