From: "Philip Oakley" <philipoakley@iee.org>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Christoph Michelbach" <michelbach94@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH] Documentation/git-checkout: make doc. of checkout <tree-ish> clearer
Date: Wed, 19 Apr 2017 09:14:31 +0100 [thread overview]
Message-ID: <FFDB9C5D48B642D7B8E4C30352815565@PhilipOakley> (raw)
In-Reply-To: xmqqefwqims1.fsf@gitster.mtv.corp.google.com
Thanks,
The link does contatin the ref to the original commit, which is helpful.
(expands to https://github.com/git/git/commit/0a1283bc3955a97557)
Philip
[I'll be off-line all day]
----- Original Message -----
From: "Junio C Hamano" <gitster@pobox.com>
To: "Philip Oakley" <philipoakley@iee.org>
Cc: "Christoph Michelbach" <michelbach94@gmail.com>; "Git Mailing List"
<git@vger.kernel.org>
Sent: Tuesday, April 18, 2017 1:26 AM
Subject: Re: [PATCH] Documentation/git-checkout: make doc. of checkout
<tree-ish> clearer
> "Philip Oakley" <philipoakley@iee.org> writes:
>
>> I'd guess that the misunderstanding is that you maybe thought that the
>> whole directory would be reset to it's old state and the files b and c
>> deleted, rather than just the named files present in that old commit
>> being extracted. If we'd created and added a file d just before the
>> checkout, what should have happened to d, and why?
>
> It probably is a bit unfair to call it "misunderstanding". I've had
> this entry in the "Leftover Bits" list for quite some time:
>
> git checkout $commit -- somedir may want to remove somedir/file that
> is not in $commit but is in the original index. Anybody who wants to
> do this needs to consider ramifications and devise transition plans.
> Cf. $gmane/234935
>
> In the thread, this message:
>
> https://public-inbox.org/git/xmqqeh8nxltc.fsf@gitster.dls.corp.google.com/
>
> may be a good summary.
>
prev parent reply other threads:[~2017-04-19 8:14 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-15 20:17 [PATCH] Documentation/git-checkout: make doc. of checkout <tree-ish> clearer Christoph Michelbach
2017-04-15 23:28 ` Philip Oakley
2017-04-16 13:01 ` Christoph Michelbach
2017-04-16 18:03 ` Philip Oakley
2017-04-16 18:51 ` Christoph Michelbach
2017-04-16 21:25 ` Philip Oakley
2017-04-16 22:06 ` Christoph Michelbach
2017-04-17 16:04 ` Philip Oakley
[not found] ` <1492452173.11708.22.camel@gmail.com>
2017-04-17 20:59 ` Philip Oakley
2017-04-18 0:31 ` Junio C Hamano
2017-04-18 12:26 ` Christoph Michelbach
2017-04-19 1:40 ` Junio C Hamano
2017-04-22 17:12 ` Christoph Michelbach
2017-04-24 1:55 ` Junio C Hamano
2017-04-24 12:24 ` Christoph Michelbach
2017-04-24 12:46 ` Christoph Michelbach
2017-04-25 1:35 ` Junio C Hamano
2017-04-25 9:11 ` Christoph Michelbach
2017-04-19 7:32 ` Philip Oakley
2017-04-18 11:50 ` Christoph Michelbach
2017-04-18 0:26 ` Junio C Hamano
2017-04-18 12:02 ` Christoph Michelbach
2017-04-19 8:14 ` Philip Oakley [this message]
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=FFDB9C5D48B642D7B8E4C30352815565@PhilipOakley \
--to=philipoakley@iee.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michelbach94@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox