From: David Kastrup <dak@gnu.org>
To: "Pierre-François CLEMENT" <likeyn@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Git reset --hard with staged changes
Date: Tue, 10 Jun 2014 17:27:26 +0200 [thread overview]
Message-ID: <871tuwss2p.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <CANWD=rUz9Wgoktp7-NkQMvWDmYOPv0kMqUNoe4FPJ9+Ax_UJBA@mail.gmail.com> ("Pierre-François CLEMENT"'s message of "Tue, 10 Jun 2014 16:59:19 +0200")
Pierre-François CLEMENT <likeyn@gmail.com> writes:
> 2014-06-10 1:28 GMT+02:00 Junio C Hamano <gitster@pobox.com>:
>> Pierre-François CLEMENT <likeyn@gmail.com> writes:
>>
>>> Hm, I didn't think of "git apply --index"... Makes sense for this
>>> special use, but I'm not sure about the other use cases.
>>
>> Try merging another branch that tracks a file your current branch
>> does not know about and ending up with conflicts during that merge.
>> Resetting the half-done result away must remove that new path from
>> your working tree and the index.
>
> Hm I see. Even though the documentation doesn't make it very clear
> about what happens to such files, it turns out the scenario we
> stumbled upon seems to be the special use case after all. Thanks for
> shedding some light on this :) I wonder why does git-reset's hard mode
> not always remove untracked files then?
Because it never removes them? Git only removes files once it tracks
them. This includes the operation of removing _and_ untracking them,
like with git reset --hard.
The only command which explicitly messes with untracked files is
git-clean.
--
David Kastrup
next prev parent reply other threads:[~2014-06-10 15:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CANWD=rWmzgAwTp=E_1=th0Myk-dh4m5Y9PE3=fpHeirsVVQKwQ@mail.gmail.com>
2014-06-09 11:24 ` Git reset --hard with staged changes Pierre-François CLEMENT
2014-06-09 14:04 ` David Kastrup
2014-06-09 23:22 ` Pierre-François CLEMENT
2014-06-09 23:28 ` Junio C Hamano
2014-06-10 14:59 ` Pierre-François CLEMENT
2014-06-10 15:27 ` David Kastrup [this message]
2014-06-10 16:30 ` Pierre-François CLEMENT
2014-06-10 1:03 ` Dale Worley
2014-06-10 5:44 ` Junio C Hamano
2016-05-23 0:55 Yotam Gingold
2016-05-23 17:05 ` Junio C Hamano
2016-05-23 19:31 ` Christian Couder
2016-05-23 21:16 ` Junio C Hamano
2016-05-24 6:20 ` Christian Couder
2016-05-30 5:07 ` Yotam Gingold
2016-05-31 6:02 ` Junio C Hamano
2016-05-31 6:41 ` Christian Couder
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=871tuwss2p.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=likeyn@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.
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).