| commit | 9570d67c00d6f2994e540aab3abee8f989c350ea | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Fri, 29 May 2015 11:44:42 +0000 (29 19:44 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2015 16:15:24 +0000 (29 09:15 -0700) | ||
| tree | 8edff964c4c393d311f4855b2e4e07075186b925 | treesnapshot (tar.gz zip) |
| parent | 9f992262fb8fdbac94f3a86f6bdf7182aab7feb6 | commitdiff |
t5520: test --rebase with multiple branches
Since rebasing on top of multiple upstream branches does not make sense,
since 51b2ead (disallow providing multiple upstream branches to rebase,
pull --rebase, 2009-02-18), git-pull explicitly disallowed specifying
multiple branches in the rebase case.
Implement tests to ensure that git-pull fails and prints out the
user-friendly error message in such a case.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since rebasing on top of multiple upstream branches does not make sense,
since 51b2ead (disallow providing multiple upstream branches to rebase,
pull --rebase, 2009-02-18), git-pull explicitly disallowed specifying
multiple branches in the rebase case.
Implement tests to ensure that git-pull fails and prints out the
user-friendly error message in such a case.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t5520-pull.sh | diffblobblamehistory |