Re: [PATCH] Documentation/git-checkout: make doc. of checkout <tree-ish> clearer
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Apr 19, 2017, 08:14 UTC
- Message-ID
- <FFDB9C5D48B642D7B8E4C30352815565@PhilipOakley>
- 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
Show 22 quoted lines
> "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. >