From: Phil Susi <phillsusi@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Stefan Beller <sbeller@google.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git checkout --theirs fails
Date: Wed, 16 Mar 2016 08:45:57 -0400 [thread overview]
Message-ID: <56E95585.30409@gmail.com> (raw)
In-Reply-To: <xmqqd1qv76rn.fsf@gitster.mtv.corp.google.com>
On 3/15/2016 5:47 PM, Junio C Hamano wrote:
> would fail when the path file/name is unmerged and does not have
> stage #3 entry, wouldn't it? So with ".", unless all paths that
> match that pathspec (i.e. all available files) are either merged
> (i.e. without conflict) or have stage #3 entry, it is expected that
> the command would fail consistently to the case where a pathspec
> "file/name" that happens to match only one path is given, and that
> is the behaviour Phil saw, I would think.
Right... why is this though? Why doesn't it just check out those files
that *do* have a #3 entry? And also why the nonsense about switching
branches when you don't specify any path or branch?
next prev parent reply other threads:[~2016-03-16 12:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 17:27 git checkout --theirs fails Phil Susi
2016-03-15 21:35 ` Stefan Beller
2016-03-15 21:47 ` Junio C Hamano
2016-03-16 12:45 ` Phil Susi [this message]
2016-03-16 21:12 ` Jeff King
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=56E95585.30409@gmail.com \
--to=phillsusi@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.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.