git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* git add --intent-to-add and git stash
@ 2020-10-04 18:53 Jonathan Müller
  0 siblings, 0 replies; only message in thread
From: Jonathan Müller @ 2020-10-04 18:53 UTC (permalink / raw)
  To: git

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2020-10-04 18:53 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-04 18:53 git add --intent-to-add and git stash Jonathan Müller

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).