Merge branch 'so/rebase-doc'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:42 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:42 +0000 (11:38 -0700)
* so/rebase-doc:
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>

Trivial merge