Merge branch 'so/rebase-doc'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:03 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:04 +0000 (12:54 -0700)
May need further updates to the description to explain what makes
various modes of operation to decide that the request can become a
"no-op".

* so/rebase-doc:
Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-op

Trivial merge