From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 15 Feb 2009 09:44:15 +0000 (-0800)
Subject: Merge branch 'ms/mailmap'
X-Git-Tag: v1.6.2-rc1~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=160d2bc35382fb23beb99457e9111d15554bf223;p=git.git

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
---

160d2bc35382fb23beb99457e9111d15554bf223