From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Sep 2014 05:08:12 +0000 (-0700)
Subject: Merge branch 'so/rebase-doc' into maint
X-Git-Tag: v2.1.2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e7867e80f00bf54634a2e15abd762ac615c5b791

Merge branch 'so/rebase-doc' into maint

* 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
---

e7867e80f00bf54634a2e15abd762ac615c5b791