Re: [RFC/PATCH] status: suggest 'git merge --abort' when appropriate

2016-07-22 Thread Junio C Hamano
Matthieu Moy writes: > We already suggest 'git rebase --abort' during a conflicted rebase. > Similarly, suggest 'git merge --abort' during conflict resolution on > 'git merge'. > > Signed-off-by: Matthieu Moy > --- It wasn't immediately obvious without the context that the changed code will tri

Re: [RFC/PATCH] status: suggest 'git merge --abort' when appropriate

2016-07-21 Thread Stefan Beller
On Thu, Jul 21, 2016 at 5:58 AM, Matthieu Moy wrote: > We already suggest 'git rebase --abort' during a conflicted rebase. > Similarly, suggest 'git merge --abort' during conflict resolution on > 'git merge'. I think this is a good addition. Thanks, Stefan -- To unsubscribe from this list: send

[RFC/PATCH] status: suggest 'git merge --abort' when appropriate

2016-07-21 Thread Matthieu Moy
We already suggest 'git rebase --abort' during a conflicted rebase. Similarly, suggest 'git merge --abort' during conflict resolution on 'git merge'. Signed-off-by: Matthieu Moy --- t/t7060-wtstatus.sh| 4 t/t7512-status-help.sh | 1 + wt-status.c| 7 +-- 3 files changed