summaryrefslogtreecommitdiff
path: root/git-gui/lib/transport.tcl
diff options
context:
space:
mode:
authorLibravatar Paul Tan <pyokagan@gmail.com>2015-05-29 19:44:42 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-29 09:15:24 -0700
commit9570d67c00d6f2994e540aab3abee8f989c350ea (patch)
tree8edff964c4c393d311f4855b2e4e07075186b925 /git-gui/lib/transport.tcl
parentt5520: test work tree fast-forward when fetch updates head (diff)
downloadtgif-9570d67c00d6f2994e540aab3abee8f989c350ea.tar.xz
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>
Diffstat (limited to 'git-gui/lib/transport.tcl')
0 files changed, 0 insertions, 0 deletions