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

Git issue

From
HFHalde, Faiz <fhalde@paypal.com>
Date
Nov 1, 2016, 10:28 UTC
Message-ID
<BY2PR0601MB16400EAC3E9683841907F4B2A2A10@BY2PR0601MB1640.namprd06.prod.outlook.com>
Hello Git
Not sure if this is a feature or a bug, but here it is.
I frequently use the following command to ignore changes done in a file
git update-index --assume-unchanged somefile
Now when I do a pull from my remote branch and say the file 'somefile' was changed locally and in remote, git will abort the merge saying I need to commit my changes of 'somefile'.
But isn't the whole point of the above command to ignore the changes within the file?

Thanks Faiz Halde

Next: Jeff King
Message 1 of 9 in “Git issue”
  1. Halde, FaizNov 1, 2016
  2. Jeff KingNov 1, 2016
  3. Junio C HamanoNov 1, 2016
  4. Jakub NarębskiNov 7, 2016
  5. Philip OakleyNov 1, 2016
  6. Jeff KingNov 1, 2016
  7. Junio C HamanoNov 1, 2016
  8. Jacob KellerNov 4, 2016
  9. doc: update-index --assume-unchangedPhilip Oakley, Nov 1, 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.