Simon Ruderich [off-list ref] writes:
On Mon, Feb 24, 2014 at 05:21:40PM +0100, Matthieu Moy wrote:
quoted
One easy thing to do OTOH would be to show a hint at the end of "git
stash pop"'s output, like
I think that's a good idea. It makes it obvious that Git has kept
the stash and that the user should drop it when he's done - if he
wants to.
+1
This does not mean I don't _also_ think 'git add' dropping the stash
when the last conflict is resolved is a good idea. If that is
implemented, 'stash pop' might have to mention that effect as well; that
does make things more complicated.
--
-- Stephe