Re: [PATCH 7/7] rebase: implement --[no-]autostash and rebase.autostash
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- May 13, 2013, 08:41 UTC
- Message-ID
- <vpq8v3jclwi.fsf@grenoble-inp.fr>
- In-Reply-To
- <CALkWK0kRW07qW_A1Rcyx7gML9ZNJ=g-hvE1O==zFpzToQtTg3g@mail.gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 5 quoted lines
> Matthieu Moy wrote: >> Any reason why this is not using gettext and the other messages do. >> You can run "git stash apply" or "git stash drop" at any time. > > Fixed. Thanks.
After thinking a bit, I have another nit about the message: it's not clear whether it's saying "your changes are in the work tree, but with conflicts so you may want to retry later with "git stash pop"", or "I could not apply your changes at all, do it yourself with "git stash pop"".
I suppose it's the former, but it could be more explicit.
-- Matthieu Moy http://www-verimag.imag.fr/~moy/