Merge branch 'js/maint-am-rebase-invalid-author'
commitbcdfb20ae94138eac863b4c40263dc10f29917e5
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:44 +0000 (27 12:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Jun 2010 19:07:44 +0000 (27 12:07 -0700)
tree16ac75f5d25be56dfb28fe481d03b5526791680b
parent4af574dbdc543b43e16838ed69890470b763136d
parent43c23251f924db4188cf74361cb7cc3257accce3
Merge branch 'js/maint-am-rebase-invalid-author'

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