From: Junio C Hamano <gitster@pobox.com>
To: Luke Diamand <luke@diamand.org>
Cc: Git Users <git@vger.kernel.org>
Subject: Re: BUG: checkout won't checkout?
Date: Thu, 18 Jun 2015 15:53:51 -0700 [thread overview]
Message-ID: <xmqqvbekbpc0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAE5ih79KhNXqvSNW-w8pMmiys2Dv24Rt4KFdRdoA9EuPDS3ELw@mail.gmail.com> (Luke Diamand's message of "Thu, 18 Jun 2015 23:47:03 +0100")
Luke Diamand <luke@diamand.org> writes:
>>> $ git checkout upstream/master -- subtree
>>> $ git diff upstream/master -- subtree
>>> -- still lots of deltas
>>
>> Does this show _ONLY_ additions? Or does it include modifications
>> and removals?
>
> There are indeed _ONLY_ additions.
http://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234912
http://thread.gmane.org/gmane.comp.version-control.git/234903/focus=234924
In short, it is an intended behaviour, both Peff and I consider that
the intention is bad and the behaviour should be changed.
But nothing has happened yet (it is listed as one of the "leftover
bits" http://git-blame.blogspot.com/p/leftover-bits.html).
next prev parent reply other threads:[~2015-06-18 22:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 22:07 BUG: checkout won't checkout? Luke Diamand
2015-06-18 22:13 ` Luke Diamand
2015-06-18 22:28 ` Junio C Hamano
2015-06-18 22:32 ` Junio C Hamano
2015-06-18 22:47 ` Luke Diamand
2015-06-18 22:53 ` Junio C Hamano [this message]
2015-06-18 22:56 ` Luke Diamand
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=xmqqvbekbpc0.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox