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

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

From
Arup Rakshit <aruprakshit@rocketmail.com>
Date
Jan 23, 2015, 18:27 UTC
Message-ID
<3278910.5D06XWKxyS@linux-wzza.site>
Hi,
I asked git not to track any changes to the file .gitignore. To do so I did use the command - git update-index --assume-unchanged .gitignore.
[arup@sztukajedzenia]$ git status
# On branch MajorUpgrade
# Your branch is behind 'origin/MajorUpgrade' by 4 commits, and can be fast-forwarded.
#   (use "git pull" to update your local branch)
#
nothing to commit, working directory clean
[arup@sztukajedzenia]$ git pull origin MajorUpgrade
From rubyxcube.co.uk:sztuka-jedzenia/sztukajedzenia
 * branch            MajorUpgrade -> FETCH_HEAD
Updating 59a1c07..d7b9cd3
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
Please, commit your changes or stash them before you can merge.
Aborting
[arup@sztukajedzenia]$
But you can see above, while I am taking `pull`, it is considering the file .gitignore. How should I tell `git pull` also not to consider the change the file, and skip it or something else ?
-- 
================
Regards,
Arup Rakshit
================
Debugging is twice as hard as writing the code in the first place. Therefore, if you write the code as cleverly as possible, you are, by definition, not smart enough to debug it.

--Brian Kernighan
Next: Junio C Hamano
Message 1 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.