From: Timur Tabi <timur@codeaurora.org>
To: Junio C Hamano <gitster@pobox.com>, Kevin Daudt <me@ikke.info>
Cc: git <git@vger.kernel.org>
Subject: Re: .gitignore does not ignore Makefile
Date: Thu, 22 Sep 2016 13:44:11 -0500 [thread overview]
Message-ID: <57E4267B.1050507@codeaurora.org> (raw)
In-Reply-To: <xmqqy42j4wp9.fsf@gitster.mtv.corp.google.com>
Junio C Hamano wrote:
> It actually is even worse. As the user promised Git that the <file>
> will not be modified and will be kept the same as the version in the
> index, Git reserves the right to_overwrite_ it with the version in
> the index anytime when it is convenient to do so, removing whatever
> local change the user had despite the promise to Git. The "abort
> saying that the file has changed" is merely various codepaths in the
> current implementation trying to be extra nice.
So .gitignore only ignores new files, not modified ones? That seems
odd, but I guess that's the way it's always been and I just haven't
noticed until now.
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2016-09-22 18:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-22 14:19 .gitignore does not ignore Makefile Timur Tabi
2016-09-22 15:44 ` Kevin Daudt
2016-09-22 18:26 ` Junio C Hamano
2016-09-22 18:44 ` Timur Tabi [this message]
2016-09-22 19:16 ` Junio C Hamano
2016-09-23 22:29 ` Jakub Narębski
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=57E4267B.1050507@codeaurora.org \
--to=timur@codeaurora.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ikke.info \
/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).