On 07/16/2018 02:24 AM, Chen-Yu Tsai wrote:
> On Mon, Jul 16, 2018 at 5:13 PM, Florian Fainelli <f.faine...@gmail.com>
> wrote:
>>
>>
>> On 07/15/2018 03:50 PM, Olof Johansson wrote:
>>> Thanks Stephen, I keep saying every time you catch these that I need
>>> to run the same script. :(
>>>
>>> Florian, I wonder if this happened when you rebased to squash in the fix?
>>
>> Humm, could be, all I did (and it was not the first time) was to do an
>> interactive rebase with --preserve-merges. AFAICT, all of these commits
>> came from Eric's pull request, so what I typically do is just sign off
>> on the merge commit, but do not apply my SoB to all commits coming from
>> that pull request if that makes sense?
>
> When you rebase, if the commit is re-applied, the committer changes to
> you, so you need to add your SoB to all commits you rebased.
Indeed, thanks for bringing that up Chen-Yu.
>
> I suppose you could override it with GIT_COMMITTER_NAME and
> GIT_COMMITTER_EMAIL environment variables, but that sort of distorts
> the SoB if any changes were added due to rebasing, such as resolution
> of merge conflicts.
>
> ChenYu
>
--
Florian
