From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Tue, 14 Apr 2015 14:00:49 GMT
Subject: Re: Git add -p “Your edited hunk does not apply. Edit again”
Message-ID: <vpqegnmizce.fsf@anie.imag.fr>
In-Reply-To: <CALv9gbMshdNhB58Otx5h8rmtCAU4qo9eNTqKSMzD_Phy7Sataw@mail.gmail.com>

Tanky Woo <wtq1990@gmail.com> writes:

> Stash this hunk [y,n,q,a,d,/,j,J,g,e,?]? y
> @@ -2,3 +3,4 @@
>  bbb
> +added line 2
>  ccc
>  ddd
> Stash this hunk [y,n,q,a,d,/,K,g,e,?]? y

My version does n, y, not y, y. The problem is the mix of stashed/not
stashed hunks. See my other message for a reproducible test, it does
fail on Git master.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/