Hi Git-Group,
from time to time I've got to "git stash" a bunch of files (about 20).
My problem is, sometimes "git stash pop" conflicts and all files are
added to the index - which is not what I want.
I just want to have the same behavior like "git stash pop" without
conflict has. Resolving the conflict is okay, but not "git reset HEAD"
to all other files, which I don't want to commit now.
Is there a possibility that "git stash pop" does not add all files to
the index when a conflict appears?
I've already asked this question on stackoverflow (
http://stackoverflow.com/questions/7751555/how-to-resolve-git-stash-conflict-without-commit ) - maybe this helps a bit better to describe the
problem.
Please add me to CC if possible as I'm not subscribed to this list and
reading it in the browser.
Thanks a lot in advance!
Sven
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html