git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: .gitignore does not ignore Makefile

From
TTTimur Tabi <timur@codeaurora.org>
Date
Sep 22, 2016, 18:44 UTC
Message-ID
<57E4267B.1050507@codeaurora.org>
In-Reply-To
<xmqqy42j4wp9.fsf@gitster.mtv.corp.google.com>
Junio C Hamano wrote:
Show 7 quoted lines
> 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.
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 6 in “.gitignore does not ignore Makefile”
  1. Timur TabiSep 22, 2016
  2. Kevin DaudtSep 22, 2016
  3. Junio C HamanoSep 22, 2016
  4. Timur TabiSep 22, 2016
  5. Junio C HamanoSep 22, 2016
  6. Jakub NarębskiSep 23, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.