Code

Merge branch 'js/maint-am-rebase-invalid-author' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jun 2010 23:18:43 +0000 (16:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jun 2010 23:18:43 +0000 (16:18 -0700)
* js/maint-am-rebase-invalid-author:
  am: use get_author_ident_from_commit instead of mailinfo when rebasing

1  2 
git-am.sh

diff --cc git-am.sh
Simple merge