| commit | 2c9c1c517896ece5003489adac6eaae5f7ad27b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2015 20:35:52 +0000 (2 13:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2015 20:35:52 +0000 (2 13:35 -0700) | ||
| tree | 0ae245fa8246de533af71cc3f615d39a0ca74fcb | treesnapshot (tar.gz zip) |
| parent | f86f31ab33c3406adebbb9f9f61be550dcc5a472 | commitdiff |
| parent | 80ea984da6c585ca4d63de0d8a2ce2873448e228 | commitdiff |
Merge branch 'pt/pull-tests' into pt/pull-optparse
* 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
* 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