Failed in applying to current master (
apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>
MAINTAINERS | 2 +-
.mailmap | 3 ++
contrib/gitdm/group-map-ibm | 15 ----------
gitdm.config | 38 ++++++++++++------------
{contrib => scripts}/gitdm/aliases | 1 +
{contrib => scripts}/gitdm/domain-map | 3 +-
{contrib => scripts}/gitdm/filetypes.txt | 0
{contrib => scripts}/gitdm/group-map-academics | 0
{contrib => scripts}/gitdm/group-map-alibaba | 0
{contrib => scripts}/gitdm/group-map-amd | 0
{contrib => scripts}/gitdm/group-map-cadence | 0
{contrib => scripts}/gitdm/group-map-codeweavers | 0
{contrib => scripts}/gitdm/group-map-facebook | 0
{contrib => scripts}/gitdm/group-map-huawei | 0
scripts/gitdm/group-map-ibm | 7 +++++
{contrib => scripts}/gitdm/group-map-individuals | 2 ++
{contrib => scripts}/gitdm/group-map-interns | 0
{contrib => scripts}/gitdm/group-map-janustech | 0
{contrib => scripts}/gitdm/group-map-microsoft | 0
{contrib => scripts}/gitdm/group-map-netflix | 0
{contrib => scripts}/gitdm/group-map-redhat | 0
{contrib => scripts}/gitdm/group-map-robots | 0
{contrib => scripts}/gitdm/group-map-wavecomp | 0
23 files changed, 35 insertions(+), 36 deletions(-)
delete mode 100644 contrib/gitdm/group-map-ibm
rename {contrib => scripts}/gitdm/aliases (97%)
rename {contrib => scripts}/gitdm/domain-map (94%)
rename {contrib => scripts}/gitdm/filetypes.txt (100%)
rename {contrib => scripts}/gitdm/group-map-academics (100%)
rename {contrib => scripts}/gitdm/group-map-alibaba (100%)
rename {contrib => scripts}/gitdm/group-map-amd (100%)
rename {contrib => scripts}/gitdm/group-map-cadence (100%)
rename {contrib => scripts}/gitdm/group-map-codeweavers (100%)
rename {contrib => scripts}/gitdm/group-map-facebook (100%)
rename {contrib => scripts}/gitdm/group-map-huawei (100%)
create mode 100644 scripts/gitdm/group-map-ibm
rename {contrib => scripts}/gitdm/group-map-individuals (96%)
rename {contrib => scripts}/gitdm/group-map-interns (100%)
rename {contrib => scripts}/gitdm/group-map-janustech (100%)
rename {contrib => scripts}/gitdm/group-map-microsoft (100%)
rename {contrib => scripts}/gitdm/group-map-netflix (100%)
rename {contrib => scripts}/gitdm/group-map-redhat (100%)
rename {contrib => scripts}/gitdm/group-map-robots (100%)
rename {contrib => scripts}/gitdm/group-map-wavecomp (100%)