Re: [PATCH v4 2/2] revision: implement `git log --merge` also for rebase/cherry-pick/revert

From: Johannes Sixt <j6t@kdbg.org>
Date: Feb 11, 2024, 17:59 UTC
Message-ID: <529c7b42-c606-408e-b6a3-fe189c28db9b@kdbg.org>
In-Reply-To: <1c258037-cb08-5fbc-d473-743a60cd8eab@gmail.com>

Am 11.02.24 um 17:43 schrieb Philippe Blain:

Show 20 quoted lines

> Hi Johannes,
> 
> Le 2024-02-11 à 03:34, Johannes Sixt a écrit :
> 
>>> Adjust the documentation of this option accordingly.
>>>
>>> Co-authored-by: Philippe Blain <levraiphilippeblain@gmail.com>
>>> Co-authored-by: Johannes Sixt <j6t@kdbg.org>
>>> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
>>> Signed-off-by: Michael Lohmann <mi.al.lohmann@gmail.com>
>>> [jc: tweaked in j6t's precedence fix that tries REBASE_HEAD last]
>>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>>
>> Signed-off-by trailers should occur in temporal order. Therefore, when
>> you pick up a commit and resend it, you should keep existing
>> Signed-off-by and add yours last.
> 
> Thank you, I did not know that. I guess Junio should be kept last though ?
> Or maybe  I should remove Junio's sign-off if I send a new version of the 
> patch ?

You should *not* remove Junio's Signed-off-by, because the patch went through his hands before you picked it up. Then you add your own sign-off below. Later, Junio will sign it off again.

> I'll resend with corrected order.
> 
> By the way, Michael put you as co-author but did not add your signed-off-by...

This is fine and sufficient. Micheal used some of my ideas, but I didn't take part in the patch submission process.

-- Hannes