summaryrefslogtreecommitdiff
path: root/doc/integration/github.md
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-08-10 11:31:56 +0000
committerRémy Coutable <remy@rymai.me>2016-08-10 11:31:56 +0000
commitfb4edfde0b6ce04c9ef199ad9a63a321395f37b5 (patch)
treed7c00e79dc3251aa70800c338b4ca5b319cb7711 /doc/integration/github.md
parent023d4812586faa24cce69715c606b4bf236956e9 (diff)
parent7a6c88ddd9f6cc5869a03abf6278aa3eb5f7f33c (diff)
downloadgitlab-ce-fb4edfde0b6ce04c9ef199ad9a63a321395f37b5.tar.gz
Merge branch 'add-mailmap' into 'master'
Add an initial .mailmap ## What does this MR do? Add an intiail ".mailmap" file to better map users names and email adresses for `git shortlog` and `git check-mailmap` to work better. ## Are there points in the code the reviewer needs to double check? The reviewer can try `git shortlog -nse` with and without the ".mailmap" to see the difference. ## Why was this MR needed? It starts to make `git shortlog` and `git check-mailmap` useful. ## What are the relevant issue numbers? I don't know of any. I searched for "mailmap" and found nothing. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? I can add an entry into the CHANGELOG but this is for developers only so I am not sure it is really needed. - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5583
Diffstat (limited to 'doc/integration/github.md')
0 files changed, 0 insertions, 0 deletions