summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorSanti Béjar <santi@agolina.net>2009-07-16 00:09:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-19 17:28:50 (GMT)
commita418441b4ea2ab69a17636c3020a29394d4c6562 (patch)
tree419cbb13fa8afd7a4c7b4d8b770e5f7af720ed06 /git-pull.sh
parent4525e8e41a8c0c4246a95097744604ea72198dad (diff)
downloadgit-a418441b4ea2ab69a17636c3020a29394d4c6562.zip
git-a418441b4ea2ab69a17636c3020a29394d4c6562.tar.gz
git-a418441b4ea2ab69a17636c3020a29394d4c6562.tar.bz2
t5520-pull: Test for rebased upstream + fetch + pull --rebase
If your upstream has rebased you can do: git pull --rebase but only if you haven't fetch before. Mark this case as test_expect_failure, in a later patch it will be changed to test_expect_success. Signed-off-by: Santi Béjar <santi@agolina.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions