Andrew's git / gitweb.git / diff
?
Merge branch 'so/rebase-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:08:12 +0000 (22:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Sep 2014 05:08:12 +0000 (22:08 -0700)
* so/rebase-doc:
Documentation/git-rebase.txt: <upstream> must be given to specify <branch>
Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op

Trivial merge