]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2a8644c 7d48e9e)
Merge branch 'ms/mailmap'
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 Feb 2009 09:44:15 +0000 (01:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 Feb 2009 09:44:15 +0000 (01:44 -0800)
commit160d2bc35382fb23beb99457e9111d15554bf223
treeec3722d8676e73f69c0ab172cf44a06c7aac5fc6tree | snapshot
parent2a8644c7f163e4b76a36739ba936f8d5d91c3cf4commit | diff
parent7d48e9e6f77d336376c1a554eeff0590f77e1ee1commit | diff
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
Documentation/config.txt diff1 | diff2 | blob | history
builtin-blame.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
pretty.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.