Code

Make cherry-pick use rerere for conflict resolution.
[git.git] / mailmap.h
2007-04-29 Junio C HamanoMerge branch 'jc/attr'
2007-04-29 Junio C HamanoSplit out mailmap handling out of shortlog