Merge branch 'so/rebase-doc'
commit9c9fbee8f514046c5d1c79f70c507f82c77dbad2
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:42 +0000 (19 11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:42 +0000 (19 11:38 -0700)
treef516f923c4cefae73aa73582f2cc03d00451186b
parent05fcf66b74309ab15617dbcf59be9a436f92c5ad
parent95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca
Merge branch 'so/rebase-doc'

* so/rebase-doc:
  Documentation/git-rebase.txt: <upstream> must be given to specify <branch>