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

Re: git pull not ignoring the file which has been sent to the temporary ignore list

From
Stefan Beller <sbeller@google.com>
Date
Jan 23, 2015, 21:38 UTC
Message-ID
<CAGZ79kaJkDjr7uPScKgO=P5nVZ4sQgn1aQNf9MwVuHMcA4a2NQ@mail.gmail.com>
In-Reply-To
<xmqq8ugtqjxg.fsf@gitster.dls.corp.google.com>
On Fri, Jan 23, 2015 at 1:14 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> Good answer for ".gitignore".  In general, you do not "ignore local
> changes" to tracked paths.
>

I assumed Arup would want to ignore more than is in the upstream project, so you'd come up with an appendix to the .gitignore file because that file is rather obvious to find (it's printed when git pull modifies it, 'ls' just find it, you'd not look into .git/info/exclude by chance)

Assuming you want to ignore less than the upstream project (delete some lines from .gitignore) it get's tricky in my opinion. Either have a local commit and just use 'git pull' to resolve the conflicts with upstream. The problem then arises if you want to publish your changes (such as pushing your changes and creating a pull request, then you have that commit included, which you maybe don't want to include)

Mind, that I am talking about possible work flows to circumvent an assumed problem which would result in problems as described in the first mail.

Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 10 in “git pull not ignoring the file which has been sent to the temporary ignore list”
  1. Arup RakshitJan 23, 2015
  2. Junio C HamanoJan 23, 2015
  3. Arup RakshitJan 23, 2015
  4. Stefan BellerJan 23, 2015
  5. Junio C HamanoJan 23, 2015
  6. Stefan BellerJan 23, 2015
  7. Junio C HamanoJan 23, 2015
  8. Stefan BellerJan 23, 2015
  9. Arup RakshitJan 24, 2015
  10. KevinJan 24, 2015

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.