| commit | c98370b4fd5746f6da960c0eb3a61edc8dc64bad | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jun 2015 20:11:53 +0000 (1 13:11 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Jun 2015 20:11:54 +0000 (1 13:11 -0700) | ||
| tree | 2d723c4352e2ca037bb73d5a852281aff9da6cfc | treesnapshot (tar.gz zip) |
| parent | 84de87bd369d8c23d447763d17711a2a87185dbe | commitdiff |
| parent | 80ea984da6c585ca4d63de0d8a2ce2873448e228 | commitdiff |
Merge branch 'pt/pull-tests' into next
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