From: Duy Nguyen <pclouds@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Is git-checkout's restoring d/f conflict really sane?
Date: Tue, 14 May 2019 16:41:23 +0700 [thread overview]
Message-ID: <CACsJy8Bew3i6AL_XWfhLhCvdSFYVCGoEQepi9KLmSDPVmDu5Zg@mail.gmail.com> (raw)
$ echo data > one
$ git add one
$ rm one
$ mkdir one
$ echo two > one/two
$ echo three > one/three
$ git checkout one
$ ls -l one
-rw-r--r-- 1 pclouds pclouds 5 May 14 16:36 one
Replacing a file is one thing. In this case we're deleting a directory
and unknown number of files inside (in this case 'two' and 'three').
Is this really a good thing to do?
If it's not but too late to do anything about git-checkout, could
git-restore do something better (and exactly what)?
--
Duy
next reply other threads:[~2019-05-14 9:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 9:41 Duy Nguyen [this message]
2019-05-14 10:37 ` Is git-checkout's restoring d/f conflict really sane? Junio C Hamano
2019-05-14 10:49 ` Duy Nguyen
2019-05-15 1:56 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CACsJy8Bew3i6AL_XWfhLhCvdSFYVCGoEQepi9KLmSDPVmDu5Zg@mail.gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).