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)
commit339aec7...cbd43f831ffc7dd193f53a34f918d4fb
tree8647a69...cb47666039e5dd25a51af5d59818a6a2copy hash to clipboard (tree)
parent6c1c442...e2f83037ef762d63be6edbc1f9e6e867copy hash to clipboard (diff)
parent43c2325...f924db4188cf74361cb7cc3257accce3copy hash to clipboard (diff)
git-am.sh