threads / discuss / 54344

git add --intent-to-add and git stash

Subject: git add --intent-to-add and git stash

## tl;dr

One message between Oct 4, 2020 and Oct 4, 2020.

replies: 0people: 1as markdown or json

Jonathan Müller· Oct 4, 2020, 18:53 UTC · lore

Hello,

when I try to `git stash` a file I have previously added using `git add --intent-to-add`, I get an `error: Entry 'X' not uptodate. Cannot merge.` error. I have to manually remove the file from the index, stash, and add it again after I've popped the stash.

Can `git stash` be taught to handle such files automatically?

Thanks, Jonathan

$ 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.