On Mon, Aug 10, 2015 at 10:42:30AM +0000, Ed Avis wrote: > I would find it useful to ask 'git stash pop' to always drop the stash after > applying it to the working tree, even if there were conflicts. (Only if there > was some hard error, such as an I/O error updating some of the files, should > the stash be left on the stack.) Hmm. That seems rather dangerous, but hey, if it's not the default, I guess it is your own foot that you are shooting. > Would a patch for such an --always-drop flag be accepted? I doubt you will get a good answer to that question; the attitude here is usually "well, we would have to see the patch". For instance, I don't know how easy it will be to tell merge conflicts apart from I/O errors. Figuring that out will probably be part of a rough draft patch. -Peff -- 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