diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
| commit | 73fd7f3761eeef0e28bbf04727c8a1e751a9792e (patch) | |
| tree | ee4e1e60de8c67ac5d83148b3880f14bf2d2f024 /t | |
| parent | 25756cff935b9ef11f429bd5d05aa27045679d52 (diff) | |
| parent | fe249b4219f66ae3aacfac50ad19b38c370ad115 (diff) | |
| download | git-73fd7f3761eeef0e28bbf04727c8a1e751a9792e.tar.gz | |
Merge branch 'mz/pull-rebase-rebased'
* mz/pull-rebase-rebased:
Use reflog in 'pull --rebase . foo'
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 0b489f5b12..0470a81be0 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -222,4 +222,11 @@ test_expect_success 'git pull --rebase does not reapply old patches' ' ) ' +test_expect_success 'git pull --rebase against local branch' ' + git checkout -b copy2 to-rebase-orig && + git pull --rebase . to-rebase && + test "conflicting modification" = "$(cat file)" && + test file = "$(cat file2)" +' + test_done |