During merge use existing author identity values
Rather than always using the user's preferred contact information
in their user account, try to reuse the information they stored
in a commit object that is being merged. This permits a user who
has an @android.com address in their Git commits but has chosen
to use an @example.com address as their preferred contact to have
merge commits created on their behalf use @android.com instead of
@example.com.
Change-Id: Ic7d450977b68de1566a470953eb32aec32f2daa2
Signed-off-by: Shawn O. Pearce <sop@google.com>
1 file changed
