Re: [PATCH 2/2] pull --rebase: reinstate helpful message on abort

Hi Junio, On 2015-10-09 20:36, Junio C Hamano wrote: > Johannes Schindelin writes: > >> When calling `git pull --rebase`, things can go wrong. In such a case, >> we want to tell the user about the most common ways out of this fix: >> ... >> builtin/am.c | 1 + >> 1

Re: [PATCH 2/2] pull --rebase: reinstate helpful message on abort

Johannes Schindelin writes: > Hi Junio, > > On 2015-10-09 20:36, Junio C Hamano wrote: >> Johannes Schindelin writes: >> >>> When calling `git pull --rebase`, things can go wrong. In such a case, >>> we want to tell the user about the

Re: [PATCH 2/2] pull --rebase: reinstate helpful message on abort

Johannes Schindelin writes: > When calling `git pull --rebase`, things can go wrong. In such a case, > we want to tell the user about the most common ways out of this fix: > ... > builtin/am.c | 1 + > 1 file changed, 1 insertion(+) It is strange to see a patch to

[PATCH 2/2] pull --rebase: reinstate helpful message on abort

When calling `git pull --rebase`, things can go wrong. In such a case, we want to tell the user about the most common ways out of this fix: Patch failed at [...] [...] When you have resolved this problem, run "git rebase --continue". If you prefer to skip this