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

Re: real git pull grief

From
JVJay Vee <jvsrvcs@gmail.com>
Date
Jan 16, 2013, 00:50 UTC
Message-ID
<CADq_mb-tjya_Vd-V9nXSckzjbz1m9g0QXX=Ma28-j0TsZD8jtw@mail.gmail.com>
In-Reply-To
<20130116004534.GG12524@google.com>

git diff shows a list of files that I have made some changes to and the diff for files that I have not changed.

The files I have made changes to (config files), I never want to commit or push and sometimes I may want them overwritten. for now I simply want to leave them there (changes to .sql files that are specific to my environment).

What I want to know is why git is reporting that changes will be overwritten to files that I have not touched or changed.

Show 5 quoted lines
>> $git diff spews a lot of information.
>
> Just a representative first 20 lines or so would be fine. :)
>
> Jonathan
Previous: Jonathan Nieder
Message 3 of 3 in “real git pull grief”
  1. Jay VeeJan 16, 2013
  2. Jonathan NiederJan 16, 2013
  3. Jay VeeJan 16, 2013

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.