| commit | a418441b4ea2ab69a17636c3020a29394d4c6562 | |
| author | Santi Béjar <santi@agolina.net> | |
| Thu, 16 Jul 2009 00:09:14 +0000 (16 02:09 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Jul 2009 17:28:50 +0000 (19 10:28 -0700) | ||
| tree | 419cbb13fa8afd7a4c7b4d8b770e5f7af720ed06 | treesnapshot (tar.gz zip) |
| parent | 4525e8e41a8c0c4246a95097744604ea72198dad | commitdiff |
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>
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>
| t/t5520-pull.sh | diffblobblamehistory |