Merge branch 'jn/rebase-cmdline-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jun 2010 18:16:56 +0000 (11:16 -0700)
* jn/rebase-cmdline-fix:
rebase: improve error message when upstream argument is missing

Trivial merge