| commit | e7867e80f00bf54634a2e15abd762ac615c5b791 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Sep 2014 05:08:12 +0000 (29 22:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 30 Sep 2014 05:08:12 +0000 (29 22:08 -0700) | ||
| tree | a90cbde45e11212a580ee68a21a4023b10beef6f | treesnapshot (tar.gz zip) |
| parent | 62b553cdd6cd41d60b3e0c6fe4a85a951712df97 | commitdiff |
| parent | 95c68267ff84c02a97d0f2c18b4b4fbfee7a7fca | commitdiff |
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
* 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