diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:15 -0800 |
| commit | 160d2bc35382fb23beb99457e9111d15554bf223 (patch) | |
| tree | ec3722d8676e73f69c0ab172cf44a06c7aac5fc6 /Documentation/git-blame.txt | |
| parent | 2a8644c7f163e4b76a36739ba936f8d5d91c3cf4 (diff) | |
| parent | 7d48e9e6f77d336376c1a554eeff0590f77e1ee1 (diff) | |
| download | git-160d2bc35382fb23beb99457e9111d15554bf223.tar.gz | |
Merge branch 'ms/mailmap'
* ms/mailmap:
Move mailmap documentation into separate file
Change current mailmap usage to do matching on both name and email of author/committer.
Add map_user() and clear_mailmap() to mailmap
Add find_insert_index, insert_at_index and clear_func functions to string_list
Add mailmap.file as configurational option for mailmap location
Diffstat (limited to 'Documentation/git-blame.txt')
| -rw-r--r-- | Documentation/git-blame.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index fba374d652..6999cf2a65 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -184,6 +184,12 @@ there is ever added information (like the commit encoding or extended commit commentary), a blame viewer won't ever care. +MAPPING AUTHORS +--------------- + +include::mailmap.txt[] + + SEE ALSO -------- linkgit:git-annotate[1] |