Re: [PATCH v10 00/10] Fix scissors bug during conflict

2019-04-18 Thread Phillip Wood
On 18/04/2019 06:19, Junio C Hamano wrote: Phillip Wood writes: From: Phillip Wood With Denton's blessing I've rebased his patches on top of my patch to fix the message cleanup with cherry-pick --signoff and -x [1]. I've Note that the base is a merge of that patch (which is based on maint)

Re: [PATCH v10 00/10] Fix scissors bug during conflict

2019-04-17 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > With Denton's blessing I've rebased his patches on top of my patch to > fix the message cleanup with cherry-pick --signoff and -x [1]. I've > > [1] > https://public-inbox.org/git/20190329110842.30604-1-phillip.wood...@gmail.com/ Hmph, I certainly s

[PATCH v10 00/10] Fix scissors bug during conflict

2019-04-17 Thread Phillip Wood
From: Phillip Wood With Denton's blessing I've rebased his patches on top of my patch to fix the message cleanup with cherry-pick --signoff and -x [1]. I've also refactored a couple of the patches and cleaned up the coding style in places. The refactoring aims to simplify the code that deals with