On Wed, May 24, 2017 at 7:27 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Stefan Beller <sbeller@xxxxxxxxxx> writes: > >> When a patch consists mostly of moving blocks of code around, it can >> be quite tedious to ensure that the blocks are moved verbatim, and not >> ... >> cases. This leads to another thought: We could pass on '--color-moved' to >> submodules such that they color up moved lines for themselves. If we'd do >> so only line moves within a repository boundary are marked up. >> >> Helped-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx> >> Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> >> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> >> >> # Conflicts: >> # diff.c >> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> >> Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> >> --- > > Hmph, what are these final lines about? See the explanation in the patch 16/17. My guess is that one of us (me) was careless again. The commented lines are easily produced by git-gui, that I use. I think it just takes the commit message from the underlying git-core. But unlike git-core, it doesn't strip off commented lines as there is no extra information in comments presented. I wonder how you are the first signoff after the conflict markers though, as that would hint that you signed off a commit message with the commented conflict lines first, before I had them. Puzzeled, will fix in a reroll. Thanks, Stefan