On 16/11/17 05:22, Junio C Hamano wrote:
> From: Phillip Wood
> Date: Wed, 15 Nov 2017 10:41:25 +
>
> If the index cannot be locked in do_recursive_merge(), issue an
> error message and go on to the error recovery codepath, instead of
> dying. When the commit cannot be picked, it needs to be
From: Phillip Wood
Date: Wed, 15 Nov 2017 10:41:25 +
If the index cannot be locked in do_recursive_merge(), issue an
error message and go on to the error recovery codepath, instead of
dying. When the commit cannot be picked, it needs to be rescheduled
when performing an interactive rebase, b
2 matches
Mail list logo
