Merge branch 'js/maint-am-rebase-invalid-author' into maint
commit339aec7acbd43f831ffc7dd193f53a34f918d4fb
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jun 2010 23:18:43 +0000 (28 16:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jun 2010 23:18:43 +0000 (28 16:18 -0700)
tree8647a694cb47666039e5dd25a51af5d59818a6a2
parent6c1c4423e2f83037ef762d63be6edbc1f9e6e867
parent43c23251f924db4188cf74361cb7cc3257accce3
Merge branch 'js/maint-am-rebase-invalid-author' into maint

* js/maint-am-rebase-invalid-author:
  am: use get_author_ident_from_commit instead of mailinfo when rebasing
git-am.sh