Merge branch 'ef/maint-rebase-error-message'
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:28:25 +0000 (13:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Jun 2012 20:28:25 +0000 (13:28 -0700)
By Erik Faye-Lund
* ef/maint-rebase-error-message:
  rebase: report invalid commit correctly

1  2 
git-rebase.sh

diff --cc git-rebase.sh
Simple merge