| commit | 0e04b248b5d5828b907a346e920dda4003311406 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 16:29:58 +0000 (11 09:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jun 2015 16:29:58 +0000 (11 09:29 -0700) | ||
| tree | 0182a9c3998c6391b84fabe4b0500fac2cc62730 | treesnapshot (tar.gz zip) |
| parent | c491e9e4569b6304a5ce8d9f4c1602f21804d472 | commitdiff |
| parent | 80ea984da6c585ca4d63de0d8a2ce2873448e228 | commitdiff |
Merge branch 'pt/pull-tests'
Add more test coverage to "git pull".
* pt/pull-tests:
t5520: check reflog action in fast-forward merge
t5521: test --dry-run does not make any changes
t5520: test --rebase failure on unborn branch with index
t5520: test --rebase with multiple branches
t5520: test work tree fast-forward when fetch updates head
t5520: test for failure if index has unresolved entries
t5520: test no merge candidates cases
t5520: prevent field splitting in content comparisons
Add more test coverage to "git pull".
* pt/pull-tests:
t5520: check reflog action in fast-forward merge
t5521: test --dry-run does not make any changes
t5520: test --rebase failure on unborn branch with index
t5520: test --rebase with multiple branches
t5520: test work tree fast-forward when fetch updates head
t5520: test for failure if index has unresolved entries
t5520: test no merge candidates cases
t5520: prevent field splitting in content comparisons