diff mbox series

[FFmpeg-devel] mailmap: add entry for myself

Message ID 20200617141629.2249-1-zhongli_dev@126.com
State Accepted
Headers show
Series [FFmpeg-devel] mailmap: add entry for myself
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Zhong Li June 17, 2020, 2:16 p.m. UTC
Signed-off-by: Zhong Li <zhongli_dev@126.com>
---
 .mailmap | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Josh de Kock June 17, 2020, 5:16 p.m. UTC | #1
On 17/06/2020 15:16, Zhong Li wrote:
> Signed-off-by: Zhong Li <zhongli_dev@126.com>
> ---
>   .mailmap | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/.mailmap b/.mailmap
> index d1925bfab0..f14770d800 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -15,7 +15,8 @@
>   <ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
>   <ffmpeg@gyani.pro> <gyandoshi@gmail.com>
>   <atomnuker@gmail.com> <rpehlivanov@obe.tv>
> -<zhong.li@intel.com> <zhongli_dev@126.com>
> +<lizhong1008@gmail.com> <zhong.li@intel.com>
> +<lizhong1008@gmail.com> <zhongli_dev@126.com>
<lizhong1008@gmail.com> <zhongli_dev@126.com> <zhong.li@intel.com>

Is better if you would like the last two emails to be displayed as 
lizhong1008@gmail.com.
>   <andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
>   rcombs <rcombs@rcombs.me> <rodger.combs@gmail.com>
>   <thilo.borgmann@mail.de> <thilo.borgmann@googlemail.com>
>
rcombs June 17, 2020, 6:29 p.m. UTC | #2
> On Jun 17, 2020, at 12:16, Josh de Kock <josh@itanimul.li> wrote:
> 
> On 17/06/2020 15:16, Zhong Li wrote:
>> Signed-off-by: Zhong Li <zhongli_dev@126.com>
>> ---
>>  .mailmap | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>> diff --git a/.mailmap b/.mailmap
>> index d1925bfab0..f14770d800 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -15,7 +15,8 @@
>>  <ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
>>  <ffmpeg@gyani.pro> <gyandoshi@gmail.com>
>>  <atomnuker@gmail.com> <rpehlivanov@obe.tv>
>> -<zhong.li@intel.com> <zhongli_dev@126.com>
>> +<lizhong1008@gmail.com> <zhong.li@intel.com>
>> +<lizhong1008@gmail.com> <zhongli_dev@126.com>
> <lizhong1008@gmail.com> <zhongli_dev@126.com> <zhong.li@intel.com>
> 
> Is better if you would like the last two emails to be displayed as lizhong1008@gmail.com.

No, you can't have 2 old addresses on a single line. You need a separate line for each one.

>>  <andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
>>  rcombs <rcombs@rcombs.me> <rodger.combs@gmail.com>
>>  <thilo.borgmann@mail.de> <thilo.borgmann@googlemail.com>
> -- 
> Josh
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Josh de Kock June 17, 2020, 7:01 p.m. UTC | #3
On 17/06/2020 18:16, Josh de Kock wrote:
> On 17/06/2020 15:16, Zhong Li wrote:
>> Signed-off-by: Zhong Li <zhongli_dev@126.com>
>> ---
>>   .mailmap | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/.mailmap b/.mailmap
>> index d1925bfab0..f14770d800 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -15,7 +15,8 @@
>>   <ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
>>   <ffmpeg@gyani.pro> <gyandoshi@gmail.com>
>>   <atomnuker@gmail.com> <rpehlivanov@obe.tv>
>> -<zhong.li@intel.com> <zhongli_dev@126.com>
>> +<lizhong1008@gmail.com> <zhong.li@intel.com>
>> +<lizhong1008@gmail.com> <zhongli_dev@126.com>
> <lizhong1008@gmail.com> <zhongli_dev@126.com> <zhong.li@intel.com>
> 
> Is better if you would like the last two emails to be displayed as 
> lizhong1008@gmail.com.
>>   <andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
>>   rcombs <rcombs@rcombs.me> <rodger.combs@gmail.com>
>>   <thilo.borgmann@mail.de> <thilo.borgmann@googlemail.com>
>>

Actually not sure this is supported syntax. Probably just worked by 
accident in my testing.
diff mbox series

Patch

diff --git a/.mailmap b/.mailmap
index d1925bfab0..f14770d800 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,7 +15,8 @@ 
 <ceffmpeg@gmail.com> <cehoyos@rainbow.studorg.tuwien.ac.at>
 <ffmpeg@gyani.pro> <gyandoshi@gmail.com>
 <atomnuker@gmail.com> <rpehlivanov@obe.tv>
-<zhong.li@intel.com> <zhongli_dev@126.com>
+<lizhong1008@gmail.com> <zhong.li@intel.com>
+<lizhong1008@gmail.com> <zhongli_dev@126.com>
 <andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
 rcombs <rcombs@rcombs.me> <rodger.combs@gmail.com>
 <thilo.borgmann@mail.de> <thilo.borgmann@googlemail.com>