diff options
author | Marius Storm-Olsen <marius@trolltech.com> | 2009-02-08 15:34:29 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-08 12:36:38 -0800 |
commit | 0925ce4d49ef8352617e8f56231bd36802a2f138 (patch) | |
tree | d6865f15a060e43220bf8de9ba4d27fa022bd50a /t/t3030-merge-recursive.sh | |
parent | Add find_insert_index, insert_at_index and clear_func functions to string_list (diff) | |
download | tgif-0925ce4d49ef8352617e8f56231bd36802a2f138.tar.xz |
Add map_user() and clear_mailmap() to mailmap
map_user() allows to lookup and replace both email and
name of a user, based on a new style mailmap file.
The possible mailmap definitions are now:
proper_name <commit_email> # Old style
<proper_email> <commit_email> # New style
proper_name <proper_email> <commit_email> # New style
proper_name <proper_email> commit_name <commit_email> # New style
map_email() operates the same as before, with the
exception that it also will to try to match on a name
passed in through the name return buffer.
clear_mailmap() is needed to now clear the more complex
mailmap structure.
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions