From: Junio C Hamano Date: Fri, 08 Mar 2019 03:40:06 GMT Subject: Re: [PATCH v3 1/4] merge-options.txt: correct typo Message-ID: In-Reply-To: <1076d4c45108b1edad48fcac0f203c8c4e521b79.1551951770.git.liu.denton@gmail.com> Denton Liu writes: > The scissors line is included after the human commit message. Therefore, > saying "scissors will be prepended" was incorrect. Update to say > "appended" which is more correct. > > Signed-off-by: Denton Liu > --- > > Notes: > Note that this can be squashed into 6f06b6aeef (merge: add scissors line on > merge conflict, 2019-01-22) if it makes life easier. The reason why you had to make this as an incremental on top of an older codebase (cf. Phillip's comment on 3/4) is because it is already in 'next' and we do not wholesale replace. I suspect that we merged it 'next' before it was ready---sorry about that. As the original series dl/merge-cleanup-scissors-fix is a short series that is only 4 patches long, let me kick it out of 'next' to make our lives easier. That way, you can send the squashed result as a fresh iteration, solving what these new 4 patches tries to as the proper part of the series, instead of making them as if they are afterthought on top of the original 4-patch series that was incomplete. Thanks.