[U-Boot] [PATCH] mailmap: fix Ricardo's entry

[U-Boot] [PATCH] mailmap: fix Ricardo's entry

[Masahiro Yamada]

Commit df48b23428e9 (".mailmap: Add all the mail alias for Ricardo
Ribalda") assigned two different proper names for the email address
"ricardo.ribalda at uam.es".  This is a completely wrong usage as the
mailmap feature exists for coalescing together commits by the same
person whose name is sometimes spelled differently.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 .mailmap | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index f72fef1..5ea9f93 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,7 +21,6 @@ Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
 Markus Klotzbuecher <mk@denx.de>
 Prabhakar Kushwaha <prabhakar@freescale.com>
 Rajeshwari Shinde <rajeshwari.s@samsung.com>
-Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
 Ricardo Ribalda <ricardo.ribalda@uam.es>
 Ricardo Ribalda <ricardo.ribalda@gmail.com>
 Sandeep Paulraj <s-paulraj@ti.com>
-- 
1.9.1

[U-Boot] [PATCH] mailmap: fix Ricardo's entry

[Masahiro Yamada]

Hi Ricardo,

2016-01-29 11:42 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Commit df48b23428e9 (".mailmap: Add all the mail alias for Ricardo
> Ribalda") assigned two different proper names for the email address
> "ricardo.ribalda at uam.es".  This is a completely wrong usage as the
> mailmap feature exists for coalescing together commits by the same
> person whose name is sometimes spelled differently.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  .mailmap | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/.mailmap b/.mailmap
> index f72fef1..5ea9f93 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -21,7 +21,6 @@ Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
>  Markus Klotzbuecher <mk@denx.de>
>  Prabhakar Kushwaha <prabhakar@freescale.com>
>  Rajeshwari Shinde <rajeshwari.s@samsung.com>
> -Ricardo Ribalda Delgado <ricardo.ribalda@uam.es>
>  Ricardo Ribalda <ricardo.ribalda@uam.es>
>  Ricardo Ribalda <ricardo.ribalda@gmail.com>
>  Sandeep Paulraj <s-paulraj@ti.com>


Note:

I dropped the first one of the three in order not to
change the git-shortlog output.
(all of your commits are merged together into "Ricardo Ribalda".)

If this is not your intention (if you want all of them merged to
"Ricardo Ribalda Delgado"), the name part of your entries should be
fixed.



-- 
Best Regards
Masahiro Yamada

[U-Boot] mailmap: fix Ricardo's entry

[Tom Rini]

On Fri, Jan 29, 2016 at 11:42:53AM +0900, Masahiro Yamada wrote:

> Commit df48b23428e9 (".mailmap: Add all the mail alias for Ricardo
> Ribalda") assigned two different proper names for the email address
> "ricardo.ribalda at uam.es".  This is a completely wrong usage as the
> mailmap feature exists for coalescing together commits by the same
> person whose name is sometimes spelled differently.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160201/6037d326/attachment.sig>