Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ml/mailmap' into maint
author
Junio C Hamano
<gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000
(11:14 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 18 Nov 2011 19:14:00 +0000
(11:14 -0800)
* ml/mailmap:
mailmap: xcalloc mailmap_info
Conflicts:
mailmap.c
raw
(from:
79cfe0c
)
No differences found